Skip to contentSkip to conversation

btrfs: avoid superfluous calls to free_extent_map() in btrfs_encoded_read()

PATCH In review Mark Harmstone 3 participants 3 messages Oct 31, 2024 – Nov 6, 2024 Btrfs file system

lore
Share & tools
lore
#0 lore raw

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.

---
 fs/btrfs/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +2 -2
index 40f278821144..fc21e8519efe 100644
@@ -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
Reviewed-by on v1 1/1
#2 lore raw
In reply to Mark Harmstone
Quoted 5 lines · Mark Harmstone

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.

Sorry for the late rb.

Quoted 26 lines
---
  fs/btrfs/inode.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +2 -2
index 40f278821144..fc21e8519efe 100644
@@ -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: