From: Hugh Dickins <hugh@veritas.com>
Date: Sun, 28 Oct 2007 21:32:04 +0000 (+0100)
Subject: hugetlb: fix size=4G parsing
X-Git-Tag: v2.6.16.56-rc2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63419d8efa745ed9a9b7e91a324b9b933dfdbb34;p=karo-tx-linux.git

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

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")) {