diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-03 16:41:17 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-03 16:43:21 -0400 |
| commit | 6906cb6e0c8818524bf71e9eb25b4b4e92137f5b (patch) | |
| tree | 98e903cc94e976a6e230642659effb0f5ba308f4 | |
| parent | aa77e0518733648ee5cd0e6aa0143e963954cb9a (diff) | |
bcachefs: Fix a deadlock in btree_update_nodes_written()bcachefs-v5.19
btree_node_lock_nopath() is something we'd like to get rid of, it's
always prone to deadlocks if we accidentally are holding other locks,
because it doesn't mark the lock it's taking in a path: we'll want to
get rid of it in the future, but for now this patch works it by calling
bch2_trans_unlock().
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 803973ffc5f7..578ba747826e 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -650,6 +650,17 @@ err: * we're in journal error state: */ + /* + * Ensure transaction is unlocked before using + * btree_node_lock_nopath() (the use of which is always suspect, + * we need to work on removing this in the future) + * + * It should be, but get_unlocked_mut_path() -> bch2_path_get() + * calls bch2_path_upgrade(), before we call path_make_mut(), so + * we may rarely end up with a locked path besides the one we + * have here: + */ + bch2_trans_unlock(&trans); btree_node_lock_nopath_nofail(&trans, &b->c, SIX_LOCK_intent); mark_btree_node_locked(&trans, path, b->c.level, SIX_LOCK_intent); bch2_btree_path_level_init(&trans, path, b); |