projects
/
users
/
dwmw2
/
linux.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
548e7f5
)
bcachefs: Fix failure to relock in btree_node_get()
author
Kent Overstreet <kent.overstreet@linux.dev>
Sun, 18 Aug 2024 19:08:12 +0000
(15:08 -0400)
committer
Kent Overstreet <kent.overstreet@linux.dev>
Thu, 22 Aug 2024 06:07:22 +0000
(
02:07
-0400)
discovered by new trans->locked asserts
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_cache.c
patch
|
blob
|
history
diff --git
a/fs/bcachefs/btree_cache.c
b/fs/bcachefs/btree_cache.c
index f5d85b50b6f2f78c784c6ee3f10e4c5e23035171..cc778d7e769e7556ab7baf20514b5d5c6dfe9f93 100644
(file)
--- a/
fs/bcachefs/btree_cache.c
+++ b/
fs/bcachefs/btree_cache.c
@@
-974,6
+974,10
@@
retry:
bch2_btree_node_wait_on_read(b);
+ ret = bch2_trans_relock(trans);
+ if (ret)
+ return ERR_PTR(ret);
+
/*
* should_be_locked is not set on this path yet, so we need to
* relock it specifically: