]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Delete dead code
authorAlan Huang <mmpgouride@gmail.com>
Fri, 27 Sep 2024 14:26:53 +0000 (22:26 +0800)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 21 Dec 2024 06:36:14 +0000 (01:36 -0500)
lock_fail_root_changed has not been used since commit
0d7009d7ca99 ("bcachefs: Delete old deadlock avoidance code")

Remove it.

Signed-off-by: Alan Huang <mmpgouride@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_iter.c
fs/bcachefs/errcode.h

index eef9b89c561ddfdd2ef4b886fde90fb012e8e45f..01152fd5ac571bc351c200b21afc0068c6512383 100644 (file)
@@ -748,8 +748,6 @@ static inline int btree_path_lock_root(struct btree_trans *trans,
                ret = btree_node_lock(trans, path, &b->c,
                                      path->level, lock_type, trace_ip);
                if (unlikely(ret)) {
-                       if (bch2_err_matches(ret, BCH_ERR_lock_fail_root_changed))
-                               continue;
                        if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
                                return ret;
                        BUG();
index 9c4fe5cdbfb77d1d9c4135ef0cf0bb3d05f4501d..e3b0ec7a0f7346bf948f2ad5232c9c3e0a4195e2 100644 (file)
        x(BCH_ERR_btree_insert_fail,    btree_insert_need_journal_res)          \
        x(BCH_ERR_btree_insert_fail,    btree_insert_need_journal_reclaim)      \
        x(0,                            backpointer_to_overwritten_btree_node)  \
-       x(0,                            lock_fail_root_changed)                 \
        x(0,                            journal_reclaim_would_deadlock)         \
        x(EINVAL,                       fsck)                                   \
        x(BCH_ERR_fsck,                 fsck_fix)                               \