diff options
author | Andrew Morton <akpm@osdl.org> | 2006-07-12 12:03:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 15:52:55 -0400 |
commit | a29b0b74e73b66674d20a170e463fe9032f2272a (patch) | |
tree | 4fe1000e079fe22496e933b5f2a0933177b08589 /fs | |
parent | ec572e3f87c02a6dd5be25841dc482a52356947f (diff) |
[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
@@ -240,7 +240,7 @@ static struct fdtable *alloc_fdtable(int nr) | |||
240 | if (!fdt) | 240 | if (!fdt) |
241 | goto out; | 241 | goto out; |
242 | 242 | ||
243 | nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nfds)); | 243 | nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1)); |
244 | if (nfds > NR_OPEN) | 244 | if (nfds > NR_OPEN) |
245 | nfds = NR_OPEN; | 245 | nfds = NR_OPEN; |
246 | 246 | ||