From: Chandan Rajendra <chan...@linux.vnet.ibm.com> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== 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 <chan...@linux.vnet.ibm.com> Signed-off-by: Theodore Ts'o <ty...@mit.edu> Reviewed-by: Andreas Dilger <adil...@dilger.ca> Signed-off-by: Jiri Slaby <jsl...@suse.cz> --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 96f4c72fbbd2..d775b7b02dd0 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -668,7 +668,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)); -- 2.11.0