bcachefs: fix incorrect pointer check in __bch2_subvolume_delete()

For some unknown reason, checks on struct bkey_s_c_snapshot and struct
bkey_s_c_snapshot_tree pointers are missing.

Therefore, I think it would be appropriate to fix the incorrect pointer checking
through this patch.

Fixes: 4bd06f07bcb5 ("bcachefs: Fixes for snapshot_tree.master_subvol")
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/subvolume.c b/fs/bcachefs/subvolume.c
index e3d0475232e53bcb451501294357f22c848432f7..b7b96283c3161d9b2921a9c5d0c37d457407c3b5 100644 (file)
--- a/fs/bcachefs/subvolume.c
+++ b/fs/bcachefs/subvolume.c
@@ -428,7 +428,7 @@ static int __bch2_subvolume_delete(struct btree_trans *trans, u32 subvolid)
                bch2_bkey_get_iter_typed(trans, &snapshot_iter,
                                BTREE_ID_snapshots, POS(0, snapid),
                                0, snapshot);
-       ret = bkey_err(subvol);
+       ret = bkey_err(snapshot);
        bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans->c,
                                "missing snapshot %u", snapid);
        if (ret)
@@ -440,6 +440,11 @@ static int __bch2_subvolume_delete(struct btree_trans *trans, u32 subvolid)
                bch2_bkey_get_iter_typed(trans, &snapshot_tree_iter,
                                BTREE_ID_snapshot_trees, POS(0, treeid),
                                0, snapshot_tree);
+       ret = bkey_err(snapshot_tree);
+       bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans->c,
+                               "missing snapshot tree %u", treeid);
+       if (ret)
+               goto err;
 
        if (le32_to_cpu(snapshot_tree.v->master_subvol) == subvolid) {
                struct bkey_i_snapshot_tree *snapshot_tree_mut =