From 9e5d9dd7861edc4140161b9fe6938c96ec49a6a2 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 24 May 2011 17:13:05 -0700 Subject: [PATCH] --- yaml --- r: 250955 b: refs/heads/master c: 0ac1ee0bfec2a4ad118f907ce586d0dfd8db7641 h: refs/heads/master i: 250953: 4301a7d4c26b33e6871fa3a92ae0cda9834fa4c2 250951: 273739d77afa4c2a05635115059851042000ae6b v: v3 --- [refs] | 2 +- trunk/include/asm-generic/resource.h | 2 +- trunk/include/linux/fs.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2dc58d01203d..79d7e6e1ef06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db271cf03f5fe39feab8e1b1818c0880c7290c5c +refs/heads/master: 0ac1ee0bfec2a4ad118f907ce586d0dfd8db7641 diff --git a/trunk/include/asm-generic/resource.h b/trunk/include/asm-generic/resource.h index 587566f95f6c..61fa862fe08d 100644 --- a/trunk/include/asm-generic/resource.h +++ b/trunk/include/asm-generic/resource.h @@ -78,7 +78,7 @@ [RLIMIT_CORE] = { 0, RLIM_INFINITY }, \ [RLIMIT_RSS] = { RLIM_INFINITY, RLIM_INFINITY }, \ [RLIMIT_NPROC] = { 0, 0 }, \ - [RLIMIT_NOFILE] = { INR_OPEN, INR_OPEN }, \ + [RLIMIT_NOFILE] = { INR_OPEN_CUR, INR_OPEN_MAX }, \ [RLIMIT_MEMLOCK] = { MLOCK_LIMIT, MLOCK_LIMIT }, \ [RLIMIT_AS] = { RLIM_INFINITY, RLIM_INFINITY }, \ [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 5bb9e826019b..3f9d3251790d 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -23,7 +23,8 @@ /* Fixed constants first: */ #undef NR_OPEN -#define INR_OPEN 1024 /* Initial setting for nfile rlimits */ +#define INR_OPEN_CUR 1024 /* Initial setting for nfile rlimits */ +#define INR_OPEN_MAX 4096 /* Hard limit for nfile rlimits */ #define BLOCK_SIZE_BITS 10 #define BLOCK_SIZE (1<