X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2Flimit.c;fp=kernel%2Fvserver%2Flimit.c;h=e2b15d3411d427f2050dab50d3ab2087b03cf9dd;hb=67da514125f23d27bd45d41e330ef14b6206fe69;hp=9f279734db551500966834ef9228aa0e9de10c7d;hpb=e0ff8aa1acd079b70e796571917ae0449b7c465b;p=linux-2.6.git diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c index 9f279734d..e2b15d341 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