[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1301606810-11001-1-git-send-email-tim.gardner@canonical.com>
Date: Thu, 31 Mar 2011 15:26:50 -0600
From: Tim Gardner <tim.gardner@...onical.com>
To: linux-kernel@...r.kernel.org
Cc: akpm@...ux-foundation.org, Tim Gardner <tim.gardner@...onical.com>,
Dan Kegel <dank@...el.com>
Subject: [PATCH] Raise default hard ulimit on number of files to 4096
Apps are increasingly using more than 1024 file descriptors.
See discussion in several distro bug trackers, e.g.
https://bugs.launchpad.net/bugs/663090
https://issues.rpath.com/browse/RPL-2054
Cc: Dan Kegel <dank@...el.com>
Signed-off-by: Tim Gardner <tim.gardner@...onical.com>
---
include/asm-generic/resource.h | 2 +-
include/linux/fs.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h
index 587566f..61fa862 100644
--- a/include/asm-generic/resource.h
+++ b/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/include/linux/fs.h b/include/linux/fs.h
index 52f283c..6e1e4e6 100644
--- a/include/linux/fs.h
+++ b/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<<BLOCK_SIZE_BITS)
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists