New upstream release

[bcachefs-tools-debian] / libbcachefs / inode.h

diff --git a/libbcachefs/inode.h b/libbcachefs/inode.h
index 23c322d9a85b0e64a0fea7717a0a5618b2d47a98..2915f4f96f4bb3c2fc8f2190ffad7fe86a8d2408 100644 (file)
--- a/libbcachefs/inode.h
+++ b/libbcachefs/inode.h
@@ -2,22 +2,47 @@
 #ifndef _BCACHEFS_INODE_H
 #define _BCACHEFS_INODE_H
 
+#include "bkey.h"
 #include "opts.h"
 
 extern const char * const bch2_inode_opts[];
 
-const char *bch2_inode_invalid(const struct bch_fs *, struct bkey_s_c);
+int bch2_inode_invalid(const struct bch_fs *, struct bkey_s_c, int, struct printbuf *);
+int bch2_inode_v2_invalid(const struct bch_fs *, struct bkey_s_c, int, struct printbuf *);
+int bch2_inode_v3_invalid(const struct bch_fs *, struct bkey_s_c, int, struct printbuf *);
 void bch2_inode_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_inode (struct bkey_ops) {                \
        .key_invalid    = bch2_inode_invalid,           \
        .val_to_text    = bch2_inode_to_text,           \
+       .trans_trigger  = bch2_trans_mark_inode,        \
+       .atomic_trigger = bch2_mark_inode,              \
 }
 
-const char *bch2_inode_generation_invalid(const struct bch_fs *,
-                                         struct bkey_s_c);
-void bch2_inode_generation_to_text(struct printbuf *, struct bch_fs *,
-                                  struct bkey_s_c);
+#define bch2_bkey_ops_inode_v2 (struct bkey_ops) {     \
+       .key_invalid    = bch2_inode_v2_invalid,        \
+       .val_to_text    = bch2_inode_to_text,           \
+       .trans_trigger  = bch2_trans_mark_inode,        \
+       .atomic_trigger = bch2_mark_inode,              \
+}
+
+#define bch2_bkey_ops_inode_v3 (struct bkey_ops) {     \
+       .key_invalid    = bch2_inode_v3_invalid,        \
+       .val_to_text    = bch2_inode_to_text,           \
+       .trans_trigger  = bch2_trans_mark_inode,        \
+       .atomic_trigger = bch2_mark_inode,              \
+}
+
+static inline bool bkey_is_inode(const struct bkey *k)
+{
+       return  k->type == KEY_TYPE_inode ||
+               k->type == KEY_TYPE_inode_v2 ||
+               k->type == KEY_TYPE_inode_v3;
+}
+
+int bch2_inode_generation_invalid(const struct bch_fs *, struct bkey_s_c,
+                                 int, struct printbuf *);
+void bch2_inode_generation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
 #define bch2_bkey_ops_inode_generation (struct bkey_ops) {     \
        .key_invalid    = bch2_inode_generation_invalid,        \
@@ -34,29 +59,35 @@ typedef u64 u96;
 
 struct bch_inode_unpacked {
        u64                     bi_inum;
+       u64                     bi_journal_seq;
        __le64                  bi_hash_seed;
+       u64                     bi_size;
+       u64                     bi_sectors;
+       u64                     bi_version;
        u32                     bi_flags;
        u16                     bi_mode;
 
 #define x(_name, _bits)        u##_bits _name;
-       BCH_INODE_FIELDS()
+       BCH_INODE_FIELDS_v3()
 #undef  x
 };
 
 struct bkey_inode_buf {
-       struct bkey_i_inode     inode;
+       struct bkey_i_inode_v3  inode;
 
 #define x(_name, _bits)                + 8 + _bits / 8
-       u8              _pad[0 + BCH_INODE_FIELDS()];
+       u8              _pad[0 + BCH_INODE_FIELDS_v3()];
 #undef  x
 } __attribute__((packed, aligned(8)));
 
-void bch2_inode_pack(struct bch_fs *, struct bkey_inode_buf *,
-                    const struct bch_inode_unpacked *);
-int bch2_inode_unpack(struct bkey_s_c_inode, struct bch_inode_unpacked *);
+void bch2_inode_pack(struct bkey_inode_buf *, const struct bch_inode_unpacked *);
+int bch2_inode_unpack(struct bkey_s_c, struct bch_inode_unpacked *);
+struct bkey_s_c bch2_inode_to_v3(struct btree_trans *, struct bkey_s_c);
 
-struct btree_iter *bch2_inode_peek(struct btree_trans *,
-                       struct bch_inode_unpacked *, u64, unsigned);
+void bch2_inode_unpacked_to_text(struct printbuf *, struct bch_inode_unpacked *);
+
+int bch2_inode_peek(struct btree_trans *, struct btree_iter *,
+                   struct bch_inode_unpacked *, subvol_inum, unsigned);
 int bch2_inode_write(struct btree_trans *, struct btree_iter *,
                     struct bch_inode_unpacked *);
 
@@ -69,16 +100,15 @@ void bch2_inode_init(struct bch_fs *, struct bch_inode_unpacked *,
                     uid_t, gid_t, umode_t, dev_t,
                     struct bch_inode_unpacked *);
 
-struct btree_iter *bch2_inode_create(struct btree_trans *,
-                                    struct bch_inode_unpacked *, u32);
+int bch2_inode_create(struct btree_trans *, struct btree_iter *,
+                     struct bch_inode_unpacked *, u32, u64);
 
-int bch2_inode_rm(struct bch_fs *, u64, bool);
+int bch2_inode_rm(struct bch_fs *, subvol_inum);
 
-int __bch2_inode_find_by_inum_trans(struct btree_trans *, u64,
-                                   struct bch_inode_unpacked *, unsigned);
-int bch2_inode_find_by_inum_trans(struct btree_trans *, u64,
+int bch2_inode_find_by_inum_trans(struct btree_trans *, subvol_inum,
                                  struct bch_inode_unpacked *);
-int bch2_inode_find_by_inum(struct bch_fs *, u64, struct bch_inode_unpacked *);
+int bch2_inode_find_by_inum(struct bch_fs *, subvol_inum,
+                           struct bch_inode_unpacked *);
 
 static inline struct bch_io_opts bch2_inode_opts_get(struct bch_inode_unpacked *inode)
 {
@@ -135,28 +165,16 @@ static inline u8 mode_to_type(umode_t mode)
        return (mode >> 12) & 15;
 }
 
-/* i_nlink: */
-
-static inline unsigned nlink_bias(umode_t mode)
+static inline u8 inode_d_type(struct bch_inode_unpacked *inode)
 {
-       return S_ISDIR(mode) ? 2 : 1;
+       return inode->bi_subvol ? DT_SUBVOL : mode_to_type(inode->bi_mode);
 }
 
-static inline void bch2_inode_nlink_inc(struct bch_inode_unpacked *bi)
-{
-       if (bi->bi_flags & BCH_INODE_UNLINKED)
-               bi->bi_flags &= ~BCH_INODE_UNLINKED;
-       else
-               bi->bi_nlink++;
-}
+/* i_nlink: */
 
-static inline void bch2_inode_nlink_dec(struct bch_inode_unpacked *bi)
+static inline unsigned nlink_bias(umode_t mode)
 {
-       BUG_ON(bi->bi_flags & BCH_INODE_UNLINKED);
-       if (bi->bi_nlink)
-               bi->bi_nlink--;
-       else
-               bi->bi_flags |= BCH_INODE_UNLINKED;
+       return S_ISDIR(mode) ? 2 : 1;
 }
 
 static inline unsigned bch2_inode_nlink_get(struct bch_inode_unpacked *bi)
@@ -178,4 +196,7 @@ static inline void bch2_inode_nlink_set(struct bch_inode_unpacked *bi,
        }
 }
 
+int bch2_inode_nlink_inc(struct bch_inode_unpacked *);
+void bch2_inode_nlink_dec(struct btree_trans *, struct bch_inode_unpacked *);
+
 #endif /* _BCACHEFS_INODE_H */