bcachefs: Add warn param to subvol_get_snapshot, peek_inode

These shouldn't always be fatal errors - logged op resume, in
particular, and we want it as a parameter there.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c
index 19aa31c6812f40b8577d3ec51a79666c3469680a..74d7a42ba1a2150639f55552d2b1c713497cdda0 100644 (file)
--- a/fs/bcachefs/inode.c
+++ b/fs/bcachefs/inode.c
@@ -327,22 +327,20 @@ int bch2_inode_unpack(struct bkey_s_c k,
                : bch2_inode_unpack_slowpath(k, unpacked);
 }
 
-int bch2_inode_peek_nowarn(struct btree_trans *trans,
-                   struct btree_iter *iter,
-                   struct bch_inode_unpacked *inode,
-                   subvol_inum inum, unsigned flags)
+int __bch2_inode_peek(struct btree_trans *trans,
+                     struct btree_iter *iter,
+                     struct bch_inode_unpacked *inode,
+                     subvol_inum inum, unsigned flags,
+                     bool warn)
 {
-       struct bkey_s_c k;
        u32 snapshot;
-       int ret;
-
-       ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot);
+       int ret = __bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot, warn);
        if (ret)
                return ret;
 
-       k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes,
-                              SPOS(0, inum.inum, snapshot),
-                              flags|BTREE_ITER_cached);
+       struct bkey_s_c 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)
                return ret;
@@ -357,20 +355,12 @@ int bch2_inode_peek_nowarn(struct btree_trans *trans,
 
        return 0;
 err:
+       if (warn)
+               bch_err_msg(trans->c, ret, "looking up inum %llu:%llu:", inum.subvol, inum.inum);
        bch2_trans_iter_exit(trans, iter);
        return ret;
 }
 
-int bch2_inode_peek(struct btree_trans *trans,
-                   struct btree_iter *iter,
-                   struct bch_inode_unpacked *inode,
-                   subvol_inum inum, unsigned flags)
-{
-       int ret = bch2_inode_peek_nowarn(trans, iter, inode, inum, flags);
-       bch_err_msg(trans->c, ret, "looking up inum %llu:%llu:", inum.subvol, inum.inum);
-       return ret;
-}
-
 int bch2_inode_write_flags(struct btree_trans *trans,
                     struct btree_iter *iter,
                     struct bch_inode_unpacked *inode,

diff --git a/fs/bcachefs/inode.h b/fs/bcachefs/inode.h
index f597d10a252d13297e7ff5e2d27ea6476fd4184d..9c1f677056842183243d58ba18516f28f3bd8fc2 100644 (file)
--- a/fs/bcachefs/inode.h
+++ b/fs/bcachefs/inode.h
@@ -97,10 +97,26 @@ struct bkey_i *bch2_inode_to_v3(struct btree_trans *, struct bkey_i *);
 
 void bch2_inode_unpacked_to_text(struct printbuf *, struct bch_inode_unpacked *);
 
-int bch2_inode_peek_nowarn(struct btree_trans *, struct btree_iter *,
-                   struct bch_inode_unpacked *, subvol_inum, unsigned);
-int bch2_inode_peek(struct btree_trans *, struct btree_iter *,
-                   struct bch_inode_unpacked *, subvol_inum, unsigned);
+int __bch2_inode_peek(struct btree_trans *, struct btree_iter *,
+                     struct bch_inode_unpacked *, subvol_inum, unsigned, bool);
+
+static inline int bch2_inode_peek_nowarn(struct btree_trans *trans,
+                                        struct btree_iter *iter,
+                                        struct bch_inode_unpacked *inode,
+                                        subvol_inum inum, unsigned flags)
+{
+       return __bch2_inode_peek(trans, iter, inode, inum, flags, false);
+}
+
+static inline int bch2_inode_peek(struct btree_trans *trans,
+                                 struct btree_iter *iter,
+                                 struct bch_inode_unpacked *inode,
+                                 subvol_inum inum, unsigned flags)
+{
+       return __bch2_inode_peek(trans, iter, inode, inum, flags, true);
+       int ret = bch2_inode_peek_nowarn(trans, iter, inode, inum, flags);
+       return ret;
+}
 
 int bch2_inode_write_flags(struct btree_trans *, struct btree_iter *,
                     struct bch_inode_unpacked *, enum btree_iter_update_trigger_flags);

diff --git a/fs/bcachefs/subvolume.c b/fs/bcachefs/subvolume.c
index 44210a86c3674d2657e3cdbd0dba95fc80186797..91d8187ee168af24544545b17d2a8a008ca5e57e 100644 (file)
--- a/fs/bcachefs/subvolume.c
+++ b/fs/bcachefs/subvolume.c
@@ -332,8 +332,8 @@ int bch2_snapshot_get_subvol(struct btree_trans *trans, u32 snapshot,
                bch2_subvolume_get(trans, le32_to_cpu(snap.subvol), true, 0, subvol);
 }
 
-int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,
-                               u32 *snapid)
+int __bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,
+                                 u32 *snapid, bool warn)
 {
        struct btree_iter iter;
        struct bkey_s_c_subvolume subvol;
@@ -344,7 +344,8 @@ int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,
                                          BTREE_ITER_cached|BTREE_ITER_with_updates,
                                          subvolume);
        ret = bkey_err(subvol);
-       bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans->c,
+
+       bch2_fs_inconsistent_on(warn && bch2_err_matches(ret, ENOENT), trans->c,
                                "missing subvolume %u", subvolid);
 
        if (likely(!ret))
@@ -353,6 +354,12 @@ int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,
        return ret;
 }
 
+int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,
+                               u32 *snapid)
+{
+       return __bch2_subvolume_get_snapshot(trans, subvolid, snapid, true);
+}
+
 static int bch2_subvolume_reparent(struct btree_trans *trans,
                                   struct btree_iter *iter,
                                   struct bkey_s_c k,

diff --git a/fs/bcachefs/subvolume.h b/fs/bcachefs/subvolume.h
index e62f876541fe256806c01f8e05b1c48c695046ec..f897d106e14260f7da3df25ecce3ad9d207de1f1 100644 (file)
--- a/fs/bcachefs/subvolume.h
+++ b/fs/bcachefs/subvolume.h
@@ -26,6 +26,8 @@ int bch2_subvolume_trigger(struct btree_trans *, enum btree_id, unsigned,
 int bch2_subvol_has_children(struct btree_trans *, u32);
 int bch2_subvolume_get(struct btree_trans *, unsigned,
                       bool, int, struct bch_subvolume *);
+int __bch2_subvolume_get_snapshot(struct btree_trans *, u32,
+                                 u32 *, bool);
 int bch2_subvolume_get_snapshot(struct btree_trans *, u32, u32 *);
 
 int bch2_subvol_is_ro_trans(struct btree_trans *, u32);