From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 14 Oct 2021 17:14:40 +0000 (-0400)
Subject: bcachefs: Fix __bch2_dirent_read_target()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd547c8acb1aa76ceab1987109ac6ceae698fcc9;p=linux.git

bcachefs: Fix __bch2_dirent_read_target()

We were shadowing our exist status, oops

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c
index c7344ac87fcd8..cd5468b15ba26 100644
--- a/fs/bcachefs/dirent.c
+++ b/fs/bcachefs/dirent.c
@@ -183,6 +183,7 @@ int __bch2_dirent_read_target(struct btree_trans *trans,
 			      u32 *subvol, u32 *snapshot, u64 *inum,
 			      bool is_fsck)
 {
+	struct bch_subvolume s;
 	int ret = 0;
 
 	*subvol		= 0;
@@ -191,9 +192,6 @@ int __bch2_dirent_read_target(struct btree_trans *trans,
 	if (likely(d.v->d_type != DT_SUBVOL)) {
 		*inum = le64_to_cpu(d.v->d_inum);
 	} else {
-		struct bch_subvolume s;
-		int ret;
-
 		*subvol = le64_to_cpu(d.v->d_inum);
 
 		ret = bch2_subvolume_get(trans, *subvol, !is_fsck, BTREE_ITER_CACHED, &s);