Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29b0b74 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ec572e3f

fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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;