[lvc-project] [PATCH] btrfs: perform a minor cleanup in btrfs_search_path_in_tree()

[Burenchev Evgenii]

After the introduction of btrfs_search_backwards(), the directory
traversal state in btrfs_search_path_in_tree() is fully maintained via
struct btrfs_key. The local variable 'dirid' is no longer used to control
the search and the assignment

    dirid = key.objectid;

has no observable effect and is dead code.

Also initialize ret at declaration and remove a redundant
"ret = 0;" before out:.

Remove the unused assignment to avoid confusion and silence static
analysis warnings.

No functional change.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Evgenii Burenchev <eburenchev at orionsoft.ru>
---
 fs/btrfs/ioctl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a6cc2d3b414c..d85e6a92538e 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1648,7 +1648,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
 	struct btrfs_root *root;
 	struct btrfs_key key;
 	char *ptr;
-	int ret = -1;
+	int ret = 0;
 	int slot;
 	int len;
 	int total_len = 0;
@@ -1708,11 +1708,9 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
 		btrfs_release_path(path);
 		key.objectid = key.offset;
 		key.offset = (u64)-1;
-		dirid = key.objectid;
 	}
 	memmove(name, ptr, total_len);
 	name[total_len] = '\0';
-	ret = 0;
 out:
 	btrfs_put_root(root);
 	return ret;
-- 
2.43.0