diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-10-25 19:06:26 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:30 -0400 |
| commit | e219965586b0e18a12e12fdf37f26eb74bb17bcd (patch) | |
| tree | b65a6c496c8da2cf9e0e32d993e46f1bc2696306 | |
| parent | 406d6d5a0733f3eacbcd4c33905bf63c5b2f4c07 (diff) | |
bcachefs: Add missing error checking in bch2_find_by_inum_trans()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/inode.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c index aeae536b39f1..b0e670cc9d0f 100644 --- a/fs/bcachefs/inode.c +++ b/fs/bcachefs/inode.c @@ -509,7 +509,7 @@ int bch2_inode_find_by_inum_trans(struct btree_trans *trans, u64 inode_nr, { struct btree_iter *iter; struct bkey_s_c k; - int ret = -ENOENT; + int ret; iter = bch2_trans_get_iter(trans, BTREE_ID_INODES, POS(inode_nr, 0), BTREE_ITER_SLOTS); @@ -517,8 +517,13 @@ int bch2_inode_find_by_inum_trans(struct btree_trans *trans, u64 inode_nr, return PTR_ERR(iter); k = bch2_btree_iter_peek_slot(iter); - if (k.k->type == KEY_TYPE_inode) - ret = bch2_inode_unpack(bkey_s_c_to_inode(k), inode); + ret = bkey_err(k); + if (ret) + return ret; + + ret = k.k->type == KEY_TYPE_inode + ? bch2_inode_unpack(bkey_s_c_to_inode(k), inode) + : -ENOENT; bch2_trans_iter_put(trans, iter); |