diff options
| author | Chandan Rajendra <chandan@linux.vnet.ibm.com> | 2016-11-14 21:04:37 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:18:26 +0000 |
| commit | e85b25b21ae15cd124ca522d28c07b0fc847cfd2 (patch) | |
| tree | 3dd800d913dc4974fc713ef26b7a8c16d6b2a9e5 /fs | |
| parent | b5bc5cbc7fb9a0b47038bd06cd4c197a4d4ecd56 (diff) | |
ext4: fix mballoc breakage with 64k block size
commit 69e43e8cc971a79dd1ee5d4343d8e63f82725123 upstream.
'border' variable is set to a value of 2 times the block size of the
underlying filesystem. With 64k block size, the resulting value won't
fit into a 16-bit variable. Hence this commit changes the data type of
'border' to 'unsigned int'.
Fixes: c9de560ded61f
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/mballoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 242fe11aea20..3338f353687f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -652,7 +652,7 @@ static void ext4_mb_mark_free_simple(struct super_block *sb, ext4_grpblk_t min; ext4_grpblk_t max; ext4_grpblk_t chunk; - unsigned short border; + unsigned int border; BUG_ON(len > EXT4_CLUSTERS_PER_GROUP(sb)); |