34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 8ed4dcbbc3242c5c8004bb1ca5c1d47d0e8250f9 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Tue, 24 Sep 2024 05:08:39 -0400
|
|
Subject: [PATCH 012/233] bcachefs: Remove unnecessary peek_slot()
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
hash_lookup() used to return an errorcode, and a peek_slot() call was
|
|
required to get the key it looked up. But we're adding fault injection
|
|
for transaction restarts, so fix this old unconverted code.
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/fsck.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
|
|
index 6b2ddbabe3e7..c96025b8b65d 100644
|
|
--- a/fs/bcachefs/fsck.c
|
|
+++ b/fs/bcachefs/fsck.c
|
|
@@ -170,7 +170,7 @@ static int lookup_dirent_in_snapshot(struct btree_trans *trans,
|
|
if (ret)
|
|
return ret;
|
|
|
|
- struct bkey_s_c_dirent d = bkey_s_c_to_dirent(bch2_btree_iter_peek_slot(&iter));
|
|
+ struct bkey_s_c_dirent d = bkey_s_c_to_dirent(k);
|
|
*target = le64_to_cpu(d.v->d_inum);
|
|
*type = d.v->d_type;
|
|
bch2_trans_iter_exit(trans, &iter);
|
|
--
|
|
2.45.2
|
|
|