btrfs: avoid superfluous calls to free_extent_map() in btrfs_encoded_read()
PATCH 1/1 btrfs: avoid superfluous calls to free_extent_map() in btrfs_encoded_read()
Change the control flow of btrfs_encoded_read() so that it doesn't call free_extent_map() when we know that this has already been done.
Signed-off-by Mark Harmstone <[email protected]>
Suggested-by Anand Jain <[email protected]>
--- fs/btrfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +2 -2
@@ -9324,7 +9324,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ret =btrfs_encoded_read_inline (iocb, iter, start, lockend, cached_state, extent_start, count, encoded, &unlocked); - goto out_em; + goto out_unlock_extent; }/*
@@ -9384,7 +9384,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ret = -EFAULT ; }else { ret = -EIOCBQUEUED ; - goto out_em; + goto out_unlock_extent; } out_em:
Signature · 1 line
2.45.2
Quoted 5 lines · Mark Harmstone
Change the control flow of
btrfs_encoded_read()so that it doesn't callfree_extent_map()when we know that this has already been done.Signed-off-by Mark Harmstone <[email protected]>Suggested-by Anand Jain <[email protected]>
Added to for-next, thanks.
Quoted 5 lines · Mark Harmstone
Change the control flow of
btrfs_encoded_read()so that it doesn't callfree_extent_map()when we know that this has already been done.Signed-off-by Mark Harmstone <[email protected]>Suggested-by Anand Jain <[email protected]>
Sorry for the late rb.
Reviewed-by Anand Jain <[email protected]>
Quoted 26 lines
--- fs/btrfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/btrfs/inode.c +2
-2@@ -9324,7 +9324,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ret =btrfs_encoded_read_inline (iocb, iter, start, lockend, cached_state, extent_start, count, encoded, &unlocked); - goto out_em; + goto out_unlock_extent; }/* @@ -9384,7 +9384,7 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ret = -EFAULT ; }else { ret = -EIOCBQUEUED ; - goto out_em; + goto out_unlock_extent; } out_em: