diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:40 +0100 |
| commit | 7a3f6e8d2096d244ad7080673497d43f15e08bdb (patch) | |
| tree | 822a121579242ba5e474e88c8146d07223f9c4c2 /fs/ext4 | |
| parent | 68921fb4be8e567565aa704350e858db1c470eff (diff) | |
| parent | e96c5550070c189a8ccb26dc6eae76ee8eef833d (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 36 | ||||
| -rw-r--r-- | fs/ext4/resize.c | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9f8c9a3ab316..6ea6cb62f85c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3841,28 +3841,28 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) EXT4_BLOCK_SIZE_BITS(sb); stop_block = (offset + length) >> EXT4_BLOCK_SIZE_BITS(sb); - /* If there are no blocks to remove, return now */ - if (first_block >= stop_block) - goto out_stop; + /* If there are blocks to remove, do it */ + if (stop_block > first_block) { - down_write(&EXT4_I(inode)->i_data_sem); - ext4_discard_preallocations(inode); + down_write(&EXT4_I(inode)->i_data_sem); + ext4_discard_preallocations(inode); - ret = ext4_es_remove_extent(inode, first_block, - stop_block - first_block); - if (ret) { - up_write(&EXT4_I(inode)->i_data_sem); - goto out_stop; - } + ret = ext4_es_remove_extent(inode, first_block, + stop_block - first_block); + if (ret) { + up_write(&EXT4_I(inode)->i_data_sem); + goto out_stop; + } - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) - ret = ext4_ext_remove_space(inode, first_block, - stop_block - 1); - else - ret = ext4_ind_remove_space(handle, inode, first_block, - stop_block); + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + ret = ext4_ext_remove_space(inode, first_block, + stop_block - 1); + else + ret = ext4_ind_remove_space(handle, inode, first_block, + stop_block); - up_write(&EXT4_I(inode)->i_data_sem); + up_write(&EXT4_I(inode)->i_data_sem); + } if (IS_SYNC(inode)) ext4_handle_sync(handle); diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 74516efd874c..d2421fd38833 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1903,7 +1903,7 @@ retry: return 0; n_group = ext4_get_group_number(sb, n_blocks_count - 1); - if (n_group > (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) { + if (n_group >= (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) { ext4_warning(sb, "resize would cause inodes_count overflow"); return -EINVAL; } |