Skip to contentSkip to conversation

btrfs: file-item: Remove unneeded variable

PATCH In review Marcos Paulo de Souza 2 participants 2 messages Jul 26, 2021 – Jul 27, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: file-item: Remove unneeded variable

We can return from btrfs_search_slot directly.

---
 fs/btrfs/file-item.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/file-item.c +1 -3
index df6631eefc65..99ca5724ac6f 100644
@@ -233,7 +233,6 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
 			     struct btrfs_path *path, u64 objectid,
 			     u64 offset, int mod)
 {
-	int ret;
 	struct btrfs_key file_key;
 	int ins_len = mod < 0 ? -1 : 0;
 	int cow = mod != 0;
@@ -241,8 +240,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
 	file_key.objectid = objectid;
 	file_key.offset = offset;
 	file_key.type = BTRFS_EXTENT_DATA_KEY;
-	ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
-	return ret;
+	return btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
 }
 
 /*
Signature · 1 line
2.26.2
#1 lore raw
Quoted 20 lines · Marcos Paulo de Souza

We can return from btrfs_search_slot directly.

---
 fs/btrfs/file-item.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/file-item.c +0 -1
index df6631eefc65..99ca5724ac6f 100644
@@ -233,7 +233,6 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
 			     struct btrfs_path *path, u64 objectid,
 			     u64 offset, int mod)
 {
-	int ret;
 	struct btrfs_key file_key;
 	int ins_len = mod < 0 ? -1 : 0;
 	int cow = mod != 0;

fs/btrfs/file-item.c int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, · line 243

Quoted 6 lines
fs/btrfs/file-item.c +1 -2
@@ -241,8 +240,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
 	file_key.objectid = objectid;
 	file_key.offset = offset;
 	file_key.type = BTRFS_EXTENT_DATA_KEY;
-	ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
-	return ret;
+	return btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);

Here it makes sense to do the return as it means the return value convention of btrfs_search_slot also applies. I've updated changelog and subject to reflect this. Added to misc-next, thanks.