diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-22 20:45:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-06-23 15:53:37 -0400 |
| commit | 55142cd0b5ef2a2150d4708dad0c3fd54a3ffd39 (patch) | |
| tree | 81397095a23b5432d2ae14ca40d72fb37189bce5 /libbcachefs/inode.c | |
| parent | fe1bb39aa52d9140981ba1e96f3c95ddf14006ce (diff) | |
Update bcachefs sources to ca3cfad39f fixup! bcachefs: Improve iter->should_be_locked
Diffstat (limited to 'libbcachefs/inode.c')
| -rw-r--r-- | libbcachefs/inode.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libbcachefs/inode.c b/libbcachefs/inode.c index 17d8eb52..59edb4ce 100644 --- a/libbcachefs/inode.c +++ b/libbcachefs/inode.c @@ -302,7 +302,7 @@ struct btree_iter *bch2_inode_peek(struct btree_trans *trans, iter = bch2_trans_get_iter(trans, BTREE_ID_inodes, POS(0, inum), BTREE_ITER_CACHED|flags); - k = bch2_btree_iter_peek_cached(iter); + k = bch2_btree_iter_peek_slot(iter); ret = bkey_err(k); if (ret) goto err; @@ -600,15 +600,12 @@ int bch2_inode_rm(struct bch_fs *c, u64 inode_nr, bool cached) retry: bch2_trans_begin(&trans); - if (cached) { - iter = bch2_trans_get_iter(&trans, BTREE_ID_inodes, POS(0, inode_nr), - BTREE_ITER_CACHED|BTREE_ITER_INTENT); - k = bch2_btree_iter_peek_cached(iter); - } else { - iter = bch2_trans_get_iter(&trans, BTREE_ID_inodes, POS(0, inode_nr), - BTREE_ITER_SLOTS|BTREE_ITER_INTENT); - k = bch2_btree_iter_peek_slot(iter); - } + iter = bch2_trans_get_iter(&trans, BTREE_ID_inodes, POS(0, inode_nr), + (cached + ? BTREE_ITER_CACHED + : BTREE_ITER_SLOTS)| + BTREE_ITER_INTENT); + k = bch2_btree_iter_peek_slot(iter); ret = bkey_err(k); if (ret) |