diff options
| author | Jan Kara <jack@suse.cz> | 2017-01-27 14:34:30 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-01-27 14:34:30 -0500 |
| commit | cd648b8a8fd5071d232242d5ee7ee3c0815776af (patch) | |
| tree | eff784d1c9b958a05db5f6cccf5938a157a6c175 /fs | |
| parent | 43c73221b3b1cdc9156c78287c5f4b29dc085d22 (diff) | |
ext4: trim allocation requests to group size
If filesystem groups are artifically small (using parameter -g to
mkfs.ext4), ext4_mb_normalize_request() can result in a request that is
larger than a block group. Trim the request size to not confuse
allocation code.
Reported-by: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/mballoc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index ec2f64b0e696..f513f273ff89 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3133,6 +3133,13 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, if (ar->pright && start + size - 1 >= ar->lright) size -= start + size - ar->lright; + /* + * Trim allocation request for filesystems with artificially small + * groups. + */ + if (size > EXT4_BLOCKS_PER_GROUP(ac->ac_sb)) + size = EXT4_BLOCKS_PER_GROUP(ac->ac_sb); + end = start + size; /* check we don't cross already preallocated blocks */ |