Update bcachefs sources to d83b992f65 bcachefs: Rewrite journal_seq_blacklist machinery

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

diff --git a/libbcachefs/dirent.h b/libbcachefs/dirent.h
index 4d92ffba144ee13b345513c2887a5f60e0f352d1..a35d3aad29c1f44fec47bbe2a112b9e1c4ecec46 100644 (file)
--- a/libbcachefs/dirent.h
+++ b/libbcachefs/dirent.h
@@ -6,9 +6,9 @@
 extern const struct bch_hash_desc bch2_dirent_hash_desc;
 
 const char *bch2_dirent_invalid(const struct bch_fs *, struct bkey_s_c);
-void bch2_dirent_to_text(struct bch_fs *, char *, size_t, struct bkey_s_c);
+void bch2_dirent_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
-#define bch2_bkey_dirent_ops (struct bkey_ops) {       \
+#define bch2_bkey_ops_dirent (struct bkey_ops) {       \
        .key_invalid    = bch2_dirent_invalid,          \
        .val_to_text    = bch2_dirent_to_text,          \
 }
@@ -22,6 +22,12 @@ struct bch_inode_info;
 
 unsigned bch2_dirent_name_bytes(struct bkey_s_c_dirent);
 
+static inline unsigned dirent_val_u64s(unsigned len)
+{
+       return DIV_ROUND_UP(offsetof(struct bch_dirent, d_name) + len,
+                           sizeof(u64));
+}
+
 int __bch2_dirent_create(struct btree_trans *, u64,
                         const struct bch_hash_info *, u8,
                         const struct qstr *, u64, int);
@@ -48,6 +54,7 @@ int bch2_dirent_rename(struct btree_trans *,
 u64 bch2_dirent_lookup(struct bch_fs *, u64, const struct bch_hash_info *,
                       const struct qstr *);
 
+int bch2_empty_dir_trans(struct btree_trans *, u64);
 int bch2_empty_dir(struct bch_fs *, u64);
 int bch2_readdir(struct bch_fs *, struct file *, struct dir_context *);