diff options
| author | Jan Kara <jack@suse.cz> | 2017-01-27 14:34:30 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:17:00 +0100 |
| commit | 37cf4ab1ba60c30ca9fd0fe3b9993b24cb87886a (patch) | |
| tree | 5ae31931cbad22a99061507cd7b78d45d8de1d49 /fs | |
| parent | 71e91ff669a8001575b6d3b8aac690f4e7083535 (diff) | |
| download | linux-stable-37cf4ab1ba60c30ca9fd0fe3b9993b24cb87886a.tar.gz linux-stable-37cf4ab1ba60c30ca9fd0fe3b9993b24cb87886a.tar.bz2 linux-stable-37cf4ab1ba60c30ca9fd0fe3b9993b24cb87886a.zip | |
ext4: trim allocation requests to group size
commit cd648b8a8fd5071d232242d5ee7ee3c0815776af upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 425dd618a9e2..e634db9fa351 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3091,6 +3091,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 */ |