diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-09-20 13:40:00 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-09-20 13:40:00 +0000 |
| commit | 41fdf2d4816062238e18e4acbe6cb02bafa47152 (patch) | |
| tree | a95db27364c48ef502c31a593a54ee36fedd5918 /sys/kern/sysv_shm.c | |
| parent | 5cab05d889422bcf74be149d485e3d0f181b3483 (diff) | |
| download | FreeBSD-src-41fdf2d4816062238e18e4acbe6cb02bafa47152.zip FreeBSD-src-41fdf2d4816062238e18e4acbe6cb02bafa47152.tar.gz | |
Remove MAC_DEBUG + MPRINTF debugging from System V IPC. This no longer
appears to be serving a useful purpose, as it was used during initial
development of MAC support for System V IPC.
MFC after: 1 month
Obtained from: TrustedBSD Project
Suggested by: Christopher dot Vance at SPARTA dot com
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 175bc67..efcc1f6 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -94,12 +94,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_page.h> #include <vm/vm_pager.h> -#ifdef MAC_DEBUG -#define MPRINTF(a) printf a -#else -#define MPRINTF(a) -#endif - static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); #if defined(__i386__) && (defined(COMPAT_FREEBSD4) || defined(COMPAT_43)) @@ -332,10 +326,8 @@ shmdt(td, uap) #ifdef MAC shmsegptr = &shmsegs[IPCID_TO_IX(shmmap_s->shmid)]; error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr); - if (error != 0) { - MPRINTF(("mac_check_sysv_shmdt returned %d\n", error)); + if (error != 0) goto done2; - } #endif error = shm_delete_mapping(p->p_vmspace, shmmap_s); done2: @@ -393,10 +385,8 @@ kern_shmat(td, shmid, shmaddr, shmflg) goto done2; #ifdef MAC error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg); - if (error != 0) { - MPRINTF(("mac_check_sysv_shmat returned %d\n", error)); + if (error != 0) goto done2; - } #endif for (i = 0; i < shminfo.shmseg; i++) { if (shmmap_s->shmid == -1) @@ -514,11 +504,8 @@ oshmctl(td, uap) goto done2; #ifdef MAC error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd); - if (error != 0) { - MPRINTF(("mac_check_sysv_shmctl returned %d\n", - error)); + if (error != 0) goto done2; - } #endif outbuf.shm_perm = shmseg->u.shm_perm; outbuf.shm_segsz = shmseg->u.shm_segsz; @@ -604,10 +591,8 @@ kern_shmctl(td, shmid, cmd, buf, bufsz) } #ifdef MAC error = mac_check_sysv_shmctl(td->td_ucred, shmseg, cmd); - if (error != 0) { - MPRINTF(("mac_check_sysv_shmctl returned %d\n", error)); + if (error != 0) goto done2; - } #endif switch (cmd) { case SHM_STAT: @@ -733,10 +718,8 @@ shmget_existing(td, uap, mode, segnum) return (EEXIST); #ifdef MAC error = mac_check_sysv_shmget(td->td_ucred, shmseg, uap->shmflg); - if (error != 0) { - MPRINTF(("mac_check_sysv_shmget returned %d\n", error)); + if (error != 0) return (error); - } #endif error = ipcperm(td, &shmseg->u.shm_perm, mode); if (error) |
