From: Bean Huo <[email protected]>
Remove unnecessary check on the return value of block_commit_write().
Signed-off-by: Bean Huo <[email protected]>
---
fs/ext4/move_extent.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index b5af2fc03b2f..f4b4861a74ee 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -392,14 +392,11 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
for (i = 0; i < block_len_in_page; i++) {
*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
if (*err < 0)
- break;
+ goto repair_branches;
bh = bh->b_this_page;
}
- if (!*err)
- *err = block_commit_write(&folio[0]->page, from, from + replaced_size);
- if (unlikely(*err < 0))
- goto repair_branches;
+ block_commit_write(&folio[0]->page, from, from + replaced_size);
/* Even in case of data=writeback it is reasonable to pin
* inode to transaction, to prevent unexpected data loss */
--
2.34.1
On Sun 18-06-23 23:32:48, Bean Huo wrote:
> From: Bean Huo <[email protected]>
>
> Remove unnecessary check on the return value of block_commit_write().
>
> Signed-off-by: Bean Huo <[email protected]>
Looks good to me. Feel free to add:
Reviewed-by: Jan Kara <[email protected]>
Honza
> ---
> fs/ext4/move_extent.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
> index b5af2fc03b2f..f4b4861a74ee 100644
> --- a/fs/ext4/move_extent.c
> +++ b/fs/ext4/move_extent.c
> @@ -392,14 +392,11 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
> for (i = 0; i < block_len_in_page; i++) {
> *err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
> if (*err < 0)
> - break;
> + goto repair_branches;
> bh = bh->b_this_page;
> }
> - if (!*err)
> - *err = block_commit_write(&folio[0]->page, from, from + replaced_size);
>
> - if (unlikely(*err < 0))
> - goto repair_branches;
> + block_commit_write(&folio[0]->page, from, from + replaced_size);
>
> /* Even in case of data=writeback it is reasonable to pin
> * inode to transaction, to prevent unexpected data loss */
> --
> 2.34.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR