get rid of files_defer_init()

the only thing it's doing these days is calculation of upper limit for fs.nr_open sysctl and that can be done statically Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

get rid of files_defer_init()
the only thing it's doing these days is calculation of upper limit for fs.nr_open sysctl and that can be done statically Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro · Eric Lee · Eric Lee
1 parent 4d35950734
Showing 3 changed files with 4 additions and 10 deletions Side-by-side Diff
fs/file.c
fs/file_table.c
include/linux/fdtable.h
@@ -25,7 +25,10 @@
  
 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 */
+/* our max() is unusable in constant expressions ;-/ */
+#define __const_max(x, y) ((x) < (y) ? (x) : (y))
+int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &
+			 -BITS_PER_LONG;
  
 static void *alloc_fdmem(size_t size)
 {
@@ -427,12 +430,6 @@
 		task_unlock(tsk);
 		put_files_struct(files);
 	}
-}
-
-void __init files_defer_init(void)
-{
-	sysctl_nr_open_max = min((size_t)INT_MAX, ~(size_t)0/sizeof(void *)) &
-			     -BITS_PER_LONG;
 }
  
 struct files_struct init_files = {
@@ -325,7 +325,6 @@
  
 	n = (mempages * (PAGE_SIZE / 1024)) / 10;
 	files_stat.max_files = max_t(unsigned long, n, NR_FILE);
-	files_defer_init();
 	percpu_counter_init(&nr_files, 0);
 } 
@@ -63,8 +63,6 @@
 struct vfsmount;
 struct dentry;
  
-extern void __init files_defer_init(void);
-
 #define rcu_dereference_check_fdtable(files, fdtfd) \
 	rcu_dereference_check((fdtfd), lockdep_is_held(&(files)->file_lock))
...	...	@@ -25,7 +25,10 @@
25	25
26	26	int sysctl_nr_open __read_mostly = 1024*1024;
27	27	int sysctl_nr_open_min = BITS_PER_LONG;
28		-int sysctl_nr_open_max = 1024 * 1024; /* raised later */
	28	+/* our max() is unusable in constant expressions ;-/ */
	29	+#define __const_max(x, y) ((x) < (y) ? (x) : (y))
	30	+int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &
	31	+ -BITS_PER_LONG;
29	32
30	33	static void *alloc_fdmem(size_t size)
31	34	{
...	...	@@ -427,12 +430,6 @@
427	430	task_unlock(tsk);
428	431	put_files_struct(files);
429	432	}
430		-}
431		-
432		-void __init files_defer_init(void)
433		-{
434		- sysctl_nr_open_max = min((size_t)INT_MAX, ~(size_t)0/sizeof(void *)) &
435		- -BITS_PER_LONG;
436	433	}
437	434
438	435	struct files_struct init_files = {
...	...	@@ -325,7 +325,6 @@
325	325
326	326	n = (mempages * (PAGE_SIZE / 1024)) / 10;
327	327	files_stat.max_files = max_t(unsigned long, n, NR_FILE);
328		- files_defer_init();
329	328	percpu_counter_init(&nr_files, 0);
330	329	}
...	...	@@ -63,8 +63,6 @@
63	63	struct vfsmount;
64	64	struct dentry;
65	65
66		-extern void __init files_defer_init(void);
67		-
68	66	#define rcu_dereference_check_fdtable(files, fdtfd) \
69	67	rcu_dereference_check((fdtfd), lockdep_is_held(&(files)->file_lock))
70	68