summaryrefslogtreecommitdiffstats
path: root/fs/ext4/mballoc.c
diff options
context:
space:
mode:
authorMaurizio Lombardi <mlombard@redhat.com>2014-05-27 12:48:56 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-05-27 12:48:56 -0400
commitb5b60778558cafad17bbcbf63e0310bd3c68eb17 (patch)
treeb06fa811548579ac50f5956c72e9f04879aba9b6 /fs/ext4/mballoc.c
parenteeece469dedadf3918bad50ad80f4616a0064e90 (diff)
downloadtalos-obmc-linux-b5b60778558cafad17bbcbf63e0310bd3c68eb17.tar.gz
talos-obmc-linux-b5b60778558cafad17bbcbf63e0310bd3c68eb17.zip
ext4: fix wrong assert in ext4_mb_normalize_request()
The variable "size" is expressed as number of blocks and not as number of clusters, this could trigger a kernel panic when using ext4 with the size of a cluster different from the size of a block. Cc: stable@vger.kernel.org Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/mballoc.c')
-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 6ca41e7a3fe3..11dc4e0033cf 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3145,7 +3145,7 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac,
}
BUG_ON(start + size <= ac->ac_o_ex.fe_logical &&
start > ac->ac_o_ex.fe_logical);
- BUG_ON(size <= 0 || size > EXT4_CLUSTERS_PER_GROUP(ac->ac_sb));
+ BUG_ON(size <= 0 || size > EXT4_BLOCKS_PER_GROUP(ac->ac_sb));
/* now prepare goal request */
OpenPOWER on IntegriCloud