Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / ipc / util.c

diff --git a/ipc/util.c b/ipc/util.c
index 0064a79..eb61fb7 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -24,6 +24,7 @@
 #include <linux/security.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
+#include <linux/vs_base.h>
 
 #include <asm/unistd.h>
 
@@ -381,11 +382,8 @@ int ipcperms (struct kern_ipc_perm *ipcp, short flag)
                granted_mode >>= 3;
        /* is there some bit set in requested_mode but not in granted_mode? */
        if ((requested_mode & ~granted_mode & 0007) && 
-           !capable(CAP_IPC_OWNER)) {
-               if (!can_do_mlock())  {
-                       return -1;
-               }
-       }       
+           !capable(CAP_IPC_OWNER))
+               return -1;
 
        return security_ipc_permission(ipcp, flag);
 }