]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ext4: fix wrong assert in ext4_mb_normalize_request()
authorMaurizio Lombardi <mlombard@redhat.com>
Tue, 27 May 2014 16:48:56 +0000 (12:48 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 27 May 2014 16:48:56 +0000 (12:48 -0400)
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>
fs/ext4/mballoc.c

index 6ca41e7a3fe3d83fba732c341c71867f826d7d15..11dc4e0033cfdefb3adb3234a83493a806e94fa8 100644 (file)
@@ -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 */