X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2Flimit.c;h=c97d57f8198d5bea90d1c58955f44d3965a4032e;hb=1a86e528e1d8818d798e89829a4a334d1c98b9d7;hp=42e4af152aaa6ff3d23d181abd12c4e945ead314;hpb=f3b843e558cd01b1e629d000e2865812b7fd91a4;p=linux-2.6.git diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c index 42e4af152..c97d57f81 100644 --- a/kernel/vserver/limit.c +++ b/kernel/vserver/limit.c @@ -47,8 +47,6 @@ const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = { /* minimum */ 0 , /* softlimit */ - MASK_ENTRY( RLIMIT_RSS ) | - MASK_ENTRY( VLIMIT_ANON ) | 0 , /* maximum */ MASK_ENTRY( RLIMIT_RSS ) | @@ -59,8 +57,6 @@ const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = { MASK_ENTRY( RLIMIT_LOCKS ) | MASK_ENTRY( RLIMIT_MSGQUEUE ) | - MASK_ENTRY( VLIMIT_NSOCK ) | - MASK_ENTRY( VLIMIT_OPENFD ) | MASK_ENTRY( VLIMIT_ANON ) | MASK_ENTRY( VLIMIT_SHMEM ) | 0