summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2007-10-28 22:32:04 +0100
committerAdrian Bunk <bunk@kernel.org>2007-10-28 22:32:04 +0100
commit63419d8efa745ed9a9b7e91a324b9b933dfdbb34 (patch)
treedfc8974274af0b7bc27c5bf00433cd728bf2b7a3 /fs
parent255189a700d809000157d5eed1a3ede9e6426f68 (diff)
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> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/hugetlbfs/inode.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index ed8f5875e6af..fe67514e3ec1 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -661,7 +661,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")) {