Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / kernel / vserver / legacy.c

diff --git a/kernel/vserver/legacy.c b/kernel/vserver/legacy.c
index f8a657a..ec603ef 100644 (file)
--- a/kernel/vserver/legacy.c
+++ b/kernel/vserver/legacy.c
@@ -59,9 +59,7 @@ int vc_new_s_context(uint32_t ctx, void __user *data)
                return ret;
        }
 
-       if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN)
-               /* might make sense in the future, or not ... */
-               || vx_flags(VX_INFO_LOCK, 0))
+       if (!vx_check(0, VX_ADMIN) || !capable(CAP_SYS_ADMIN))
                return -EPERM;
 
        /* ugly hack for Spectator */