49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 6952c5b0d70b70638a070f50668a614235a11175 Mon Sep 17 00:00:00 2001
|
|
From: Alan Huang <mmpgouride@gmail.com>
|
|
Date: Fri, 27 Sep 2024 22:26:53 +0800
|
|
Subject: [PATCH 010/233] bcachefs: Delete dead code
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/btree_iter.c | 2 --
|
|
fs/bcachefs/errcode.h | 1 -
|
|
2 files changed, 3 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
|
|
index eef9b89c561d..01152fd5ac57 100644
|
|
--- a/fs/bcachefs/btree_iter.c
|
|
+++ b/fs/bcachefs/btree_iter.c
|
|
@@ -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();
|
|
diff --git a/fs/bcachefs/errcode.h b/fs/bcachefs/errcode.h
|
|
index 9c4fe5cdbfb7..e3b0ec7a0f73 100644
|
|
--- a/fs/bcachefs/errcode.h
|
|
+++ b/fs/bcachefs/errcode.h
|
|
@@ -164,7 +164,6 @@
|
|
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) \
|
|
--
|
|
2.45.2
|
|
|