diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-14 17:45:29 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-02 05:19:14 +0200 |
| commit | 7f4b36f9bb930b3b2105a9a2cb0121fa7028c432 (patch) | |
| tree | a1e532d174e4adc321d9dd85d9c3ac5a6b8d1549 /fs/file.c | |
| parent | namei.c: move EXPORT_SYMBOL to corresponding definitions (diff) | |
| download | linux-7f4b36f9bb930b3b2105a9a2cb0121fa7028c432.tar.xz linux-7f4b36f9bb930b3b2105a9a2cb0121fa7028c432.zip | |
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>
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/file.c b/fs/file.c index eb56a13dab3e..682103b95f8f 100644 --- a/fs/file.c +++ b/fs/file.c @@ -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) { @@ -429,12 +432,6 @@ void exit_files(struct task_struct *tsk) } } -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 = { .count = ATOMIC_INIT(1), .fdt = &init_files.fdtab, |