From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 13 Apr 2025 12:20:47 +0000 (-0400)
Subject: bcachefs: Use drop_locks_do() in bch2_inode_hash_find()
X-Git-Tag: v6.16-rc1~211^2~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83ecd1b122f49c907ea3c4178f32bd37223e7fac;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Use drop_locks_do() in bch2_inode_hash_find()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 672326693f733..17a27d6d8c9d3 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -352,9 +352,8 @@ repeat:
 			if (!trans) {
 				__wait_on_freeing_inode(c, inode, inum);
 			} else {
-				bch2_trans_unlock(trans);
-				__wait_on_freeing_inode(c, inode, inum);
-				int ret = bch2_trans_relock(trans);
+				int ret = drop_locks_do(trans,
+						(__wait_on_freeing_inode(c, inode, inum), 0));
 				if (ret)
 					return ERR_PTR(ret);
 			}