X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Ffile.c;h=7b3887e054d0bcb5e0e187c8e1e42691c4fadcd0;hb=479798211967cd828e09ce27775b8cbfe99462ab;hp=0f705c7cfefed4417ce507da9629282120931ae7;hpb=adbecb128cd2cc5d14b0ebef6d020ced0efd0ec6;p=linux-2.6

diff --git a/fs/file.c b/fs/file.c
index 0f705c7cfe..7b3887e054 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -26,6 +26,8 @@ struct fdtable_defer {
 };
 
 int sysctl_nr_open __read_mostly = 1024*1024;
+int sysctl_nr_open_min = BITS_PER_LONG;
+int sysctl_nr_open_max = 1024 * 1024; /* raised later */
 
 /*
  * We use this list to defer free fdtables that have vmalloced
@@ -405,6 +407,8 @@ void __init files_defer_init(void)
 	int i;
 	for_each_possible_cpu(i)
 		fdtable_defer_list_init(i);
+	sysctl_nr_open_max = min((size_t)INT_MAX, ~(size_t)0/sizeof(void *)) &
+			     -BITS_PER_LONG;
 }
 
 struct files_struct init_files = {