diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-07-12 09:03:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 12:52:55 -0700 |
| commit | a29b0b74e73b66674d20a170e463fe9032f2272a (patch) | |
| tree | 4fe1000e079fe22496e933b5f2a0933177b08589 /fs | |
| parent | ec572e3f87c02a6dd5be25841dc482a52356947f (diff) | |
| download | blackbird-op-linux-a29b0b74e73b66674d20a170e463fe9032f2272a.tar.gz blackbird-op-linux-a29b0b74e73b66674d20a170e463fe9032f2272a.zip | |
[PATCH] alloc_fdtable() expansion fix
We're supposed to go the next power of two if nfds==nr.
Of `nr', not of `nfsd'.
Spotted by Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index c8f1b0af8e00..b3c6b82e6a9d 100644 --- a/fs/file.c +++ b/fs/file.c @@ -240,7 +240,7 @@ static struct fdtable *alloc_fdtable(int nr) if (!fdt) goto out; - nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nfds)); + nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1)); if (nfds > NR_OPEN) nfds = NR_OPEN; |
