summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandan Rajendra <chandan@linux.vnet.ibm.com>2016-11-14 21:04:37 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-06 11:16:12 +0100
commit26492d8a22b013df435eadd91eeba2c8701206f6 (patch)
tree2a330a0e41fc840f836999e90679280d6cb91c99
parent4b6050922fb8feae8240e8b257d55fda52148e2a (diff)
downloadlinux-stable-26492d8a22b013df435eadd91eeba2c8701206f6.tar.gz
linux-stable-26492d8a22b013df435eadd91eeba2c8701206f6.tar.bz2
linux-stable-26492d8a22b013df435eadd91eeba2c8701206f6.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/ext4/mballoc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 3c7f0c44cfb3..748dec05ec7b 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -669,7 +669,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));