Linux 3.5 compat, iops->truncate_range() removed

[zfs.git] / include / sys / zfs_acl.h

diff --git a/include/sys/zfs_acl.h b/include/sys/zfs_acl.h
index c1a0aee..11fc335 100644 (file)
--- a/include/sys/zfs_acl.h
+++ b/include/sys/zfs_acl.h
@@ -28,6 +28,7 @@
 #ifdef _KERNEL
 #include <sys/isa_defs.h>
 #include <sys/types32.h>
+#include <sys/xvattr.h>
 #endif
 #include <sys/acl.h>
 #include <sys/dmu.h>
@@ -164,7 +165,7 @@ typedef struct zfs_acl {
        uint64_t        z_hints;        /* ACL hints (ZFS_INHERIT_ACE ...) */
        zfs_acl_node_t  *z_curr_node;   /* current node iterator is handling */
        list_t          z_acl;          /* chunks of ACE data */
-       acl_ops_t       z_ops;          /* ACL operations */
+       acl_ops_t       *z_ops;         /* ACL operations */
 } zfs_acl_t;
 
 typedef struct acl_locator_cb {
@@ -200,13 +201,13 @@ typedef struct zfs_acl_ids {
 #define        ZFS_ACL_PASSTHROUGH_X   5
 
 struct znode;
-struct zfsvfs;
+struct zfs_sb;
 
 #ifdef _KERNEL
 int zfs_acl_ids_create(struct znode *, int, vattr_t *,
     cred_t *, vsecattr_t *, zfs_acl_ids_t *);
 void zfs_acl_ids_free(zfs_acl_ids_t *);
-boolean_t zfs_acl_ids_overquota(struct zfsvfs *, zfs_acl_ids_t *);
+boolean_t zfs_acl_ids_overquota(struct zfs_sb *, zfs_acl_ids_t *);
 int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
 int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *);
 void zfs_acl_rele(void *);
@@ -223,7 +224,7 @@ int zfs_zaccess_delete(struct znode *, struct znode *, cred_t *);
 int zfs_zaccess_rename(struct znode *, struct znode *,
     struct znode *, struct znode *, cred_t *cr);
 void zfs_acl_free(zfs_acl_t *);
-int zfs_vsec_2_aclp(struct zfsvfs *, vtype_t, vsecattr_t *, cred_t *,
+int zfs_vsec_2_aclp(struct zfs_sb *, umode_t, vsecattr_t *, cred_t *,
     struct zfs_fuid_info **, zfs_acl_t **);
 int zfs_aclset_common(struct znode *, zfs_acl_t *, cred_t *, dmu_tx_t *);
 uint64_t zfs_external_acl(struct znode *);