[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>
This commit is contained in:
Andrew Morton 2006-07-12 09:03:08 -07:00 committed by Linus Torvalds
parent ec572e3f87
commit a29b0b74e7

View File

@ -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;