diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-09 10:12:25 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-09 10:12:25 -0800 |
| commit | 712517177d3f0df8ff8e402241d0f5a69208a95b (patch) | |
| tree | c20bb1beb8dfa95dd6023cca2e16845861742c47 /fs/ext4/mballoc.c | |
| parent | aceae9be74c70f993ddd8d6a157f1a256591c43f (diff) | |
| parent | a3edc7b2e537e36bb26c94fa9efcc249ef3a5862 (diff) | |
Merge tag 'v4.4.40' into android-4.4.y
This is the 4.4.40 stable release
Diffstat (limited to 'fs/ext4/mballoc.c')
| -rw-r--r-- | fs/ext4/mballoc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 0b1c97875686..be1227c196d8 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -669,7 +669,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)); @@ -2287,7 +2287,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v) struct ext4_group_info *grinfo; struct sg { struct ext4_group_info info; - ext4_grpblk_t counters[16]; + ext4_grpblk_t counters[EXT4_MAX_BLOCK_LOG_SIZE + 2]; } sg; group--; |