diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-29 19:33:09 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:00 -0400 |
| commit | bcb79a51cb52033bb12c5ed2eb46770e984b5542 (patch) | |
| tree | 9474d9d274906a44a8a49fba8cd4bb74144e6c64 /fs/bcachefs/inode.c | |
| parent | 174f930b8e1cad3915819a46bb20da214f68f2b5 (diff) | |
| download | linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.tar.gz linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.tar.bz2 linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.zip | |
bcachefs: bch2_bkey_get_iter() helpers
Introduce new helpers for a common pattern:
bch2_trans_iter_init();
bch2_btree_iter_peek_slot();
- bch2_bkey_get_iter_type() returns -ENOENT if it doesn't find a key of
the correct type
- bch2_bkey_get_val_typed() copies the val out of the btree to a
(typically stack allocated) variable; it handles the case where the
value in the btree is smaller than the current version of the type,
zeroing out the remainder.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/inode.c')
| -rw-r--r-- | fs/bcachefs/inode.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index 107210dd9c9a..ddcd7b125f32 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -329,13 +329,12 @@ int bch2_inode_peek(struct btree_trans *trans, if (ret) return ret; - bch2_trans_iter_init(trans, iter, BTREE_ID_inodes, - SPOS(0, inum.inum, snapshot), - flags|BTREE_ITER_CACHED); - k = bch2_btree_iter_peek_slot(iter); + k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes, + SPOS(0, inum.inum, snapshot), + flags|BTREE_ITER_CACHED); ret = bkey_err(k); if (ret) - goto err; + return ret; ret = bkey_is_inode(k.k) ? 0 : -ENOENT; if (ret) @@ -760,11 +759,9 @@ retry: if (ret) goto err; - bch2_trans_iter_init(&trans, &iter, BTREE_ID_inodes, - SPOS(0, inum.inum, snapshot), - BTREE_ITER_INTENT|BTREE_ITER_CACHED); - k = bch2_btree_iter_peek_slot(&iter); - + k = bch2_bkey_get_iter(&trans, &iter, BTREE_ID_inodes, + SPOS(0, inum.inum, snapshot), + BTREE_ITER_INTENT|BTREE_ITER_CACHED); ret = bkey_err(k); if (ret) goto err; |