Commit b9d7e6ae authored Oct 28, 2006 by Hugh Dickins Committed by Linus Torvalds Oct 28, 2006

[PATCH] hugetlb: fix size=4G parsing

On 32-bit machines, mount -t hugetlbfs -o size=4G gave a 0GB filesystem,
size=5G gave a 1GB filesystem etc: there's no point in masking size with
HPAGE_MASK just before shifting its lower bits away, and since HPAGE_MASK is a
UL, that removed all the higher bits of the unsigned long long size.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Adam Litke <agl@us.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: "Chen, Kenneth W" <kenneth.w.chen@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 7b92aadf

fs/hugetlbfs/inode.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -624,7 +624,6 @@ hugetlbfs_parse_options(char options, struct hugetlbfs_config pconfig)
		do_div(size, 100);
		rest++;
		}
		size &= HPAGE_MASK;
		pconfig->nr_blocks = (size >> HPAGE_SHIFT);
		value = rest;
		} else if (!strcmp(opt,"nr_inodes")) {