aboutsummaryrefslogtreecommitdiff
path: root/sys/kern/sysv_sem.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/sysv_sem.c')
-rw-r--r--sys/kern/sysv_sem.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index d52435455d7d..29eaecfb5b1a 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -68,11 +68,6 @@ static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores");
#else
#define DPRINTF(a)
#endif
-#ifdef MAC_DEBUG
-#define MPRINTF(a) printf a
-#else
-#define MPRINTF(a)
-#endif
static void seminit(void);
static int sysvsem_modload(struct module *, int, void *);
@@ -650,11 +645,8 @@ kern_semctl(struct thread *td, int semid, int semnum, int cmd,
goto done2;
#ifdef MAC
error = mac_check_sysv_semctl(cred, semakptr, cmd);
- if (error != 0) {
- MPRINTF(("mac_check_sysv_semctl returned %d\n",
- error));
+ if (error != 0)
goto done2;
- }
#endif
bcopy(&semakptr->u, arg->buf, sizeof(struct semid_ds));
*rval = IXSEQ_TO_IPCID(semid, semakptr->u.sem_perm);
@@ -671,10 +663,8 @@ kern_semctl(struct thread *td, int semid, int semnum, int cmd,
mtx_lock(sema_mtxp);
#ifdef MAC
error = mac_check_sysv_semctl(cred, semakptr, cmd);
- if (error != 0) {
- MPRINTF(("mac_check_sysv_semctl returned %d\n", error));
+ if (error != 0)
goto done2;
- }
#endif
error = 0;
@@ -926,11 +916,8 @@ semget(td, uap)
}
#ifdef MAC
error = mac_check_sysv_semget(cred, &sema[semid]);
- if (error != 0) {
- MPRINTF(("mac_check_sysv_semget returned %d\n",
- error));
+ if (error != 0)
goto done2;
- }
#endif
goto found;
}
@@ -1090,10 +1077,8 @@ semop(td, uap)
}
#ifdef MAC
error = mac_check_sysv_semop(td->td_ucred, semakptr, j);
- if (error != 0) {
- MPRINTF(("mac_check_sysv_semop returned %d\n", error));
+ if (error != 0)
goto done2;
- }
#endif
/*