PERFORCE change 57193 for review
Robert Watson
rwatson at FreeBSD.org
Mon Jul 12 15:53:36 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=57193
Change 57193 by rwatson at rwatson_tislabs on 2004/07/12 15:52:50
Unifdef include of mac.h; remove gratuitous white space differences
from CVS.
Affected files ...
.. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#22 edit
Differences ...
==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#22 (text+ko) ====
@@ -52,9 +52,7 @@
#include <sys/sysent.h>
#include <sys/sysproto.h>
#include <sys/jail.h>
-#ifdef MAC
#include <sys/mac.h>
-#endif
#include <vm/vm.h>
#include <vm/vm_param.h>
@@ -280,7 +278,6 @@
if (!jail_sysvipc_allowed && jailed(td->td_ucred))
return (ENOSYS);
-
mtx_lock(&Giant);
shmmap_s = p->p_vmspace->vm_shm;
if (shmmap_s == NULL) {
@@ -347,7 +344,6 @@
if (!jail_sysvipc_allowed && jailed(td->td_ucred))
return (ENOSYS);
-
mtx_lock(&Giant);
shmmap_s = p->p_vmspace->vm_shm;
if (shmmap_s == NULL) {
@@ -474,7 +470,6 @@
if (!jail_sysvipc_allowed && jailed(td->td_ucred))
return (ENOSYS);
-
mtx_lock(&Giant);
shmseg = shm_find_segment_by_shmid(uap->shmid);
if (shmseg == NULL) {
@@ -819,7 +814,6 @@
if (!jail_sysvipc_allowed && jailed(td->td_ucred))
return (ENOSYS);
-
mtx_lock(&Giant);
mode = uap->shmflg & ACCESSPERMS;
if (uap->key != IPC_PRIVATE) {
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list