Update upstream source from tag 'v1.6.3'

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

diff --git a/libbcachefs/acl.h b/libbcachefs/acl.h
index cb62d502a7ff3b3fa6034ab7e474718d7cd42e2d..27e7eec0f278c63784ec9520ffc31c7fad8cd7eb 100644 (file)
--- a/libbcachefs/acl.h
+++ b/libbcachefs/acl.h
@@ -7,8 +7,6 @@ struct bch_hash_info;
 struct bch_inode_info;
 struct posix_acl;
 
-#ifdef CONFIG_BCACHEFS_POSIX_ACL
-
 #define BCH_ACL_VERSION        0x0001
 
 typedef struct {
@@ -26,28 +24,31 @@ typedef struct {
        __le32          a_version;
 } bch_acl_header;
 
-struct posix_acl *bch2_get_acl(struct inode *, int);
+void bch2_acl_to_text(struct printbuf *, const void *, size_t);
+
+#ifdef CONFIG_BCACHEFS_POSIX_ACL
+
+struct posix_acl *bch2_get_acl(struct mnt_idmap *, struct dentry *, int);
 
-int bch2_set_acl_trans(struct btree_trans *,
+int bch2_set_acl_trans(struct btree_trans *, subvol_inum,
                       struct bch_inode_unpacked *,
-                      const struct bch_hash_info *,
                       struct posix_acl *, int);
-int bch2_set_acl(struct inode *, struct posix_acl *, int);
-int bch2_acl_chmod(struct btree_trans *, struct bch_inode_info *,
+int bch2_set_acl(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);
+int bch2_acl_chmod(struct btree_trans *, subvol_inum,
+                  struct bch_inode_unpacked *,
                   umode_t, struct posix_acl **);
 
 #else
 
-static inline int bch2_set_acl_trans(struct btree_trans *trans,
+static inline int bch2_set_acl_trans(struct btree_trans *trans, subvol_inum inum,
                                     struct bch_inode_unpacked *inode_u,
-                                    const struct bch_hash_info *hash_info,
                                     struct posix_acl *acl, int type)
 {
        return 0;
 }
 
-static inline int bch2_acl_chmod(struct btree_trans *trans,
-                                struct bch_inode_info *inode,
+static inline int bch2_acl_chmod(struct btree_trans *trans, subvol_inum inum,
+                                struct bch_inode_unpacked *inode,
                                 umode_t mode,
                                 struct posix_acl **new_acl)
 {