cstyle: Resolve C style issues

[mirror_zfs.git] / include / sys / zfs_ioctl.h

diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h
index 21bfe2b8f9b0510048c5abe912bc4eccbe9162c8..dad611328cbcb43c206fb6d918000dc73e25715f 100644 (file)
--- a/include/sys/zfs_ioctl.h
+++ b/include/sys/zfs_ioctl.h
@@ -61,6 +61,11 @@ extern "C" {
  */
 #define        ZFS_SNAPDEV_HIDDEN              0
 #define        ZFS_SNAPDEV_VISIBLE             1
+/*
+ * Property values for acltype
+ */
+#define        ZFS_ACLTYPE_OFF                 0
+#define        ZFS_ACLTYPE_POSIXACL            1
 
 /*
  * Field manipulation macros for the drr_versioninfo field of the
@@ -302,7 +307,6 @@ typedef struct zfs_cmd {
        uint64_t        zc_history;             /* really (char *) */
        char            zc_value[MAXPATHLEN * 2];
        char            zc_string[MAXNAMELEN];
-       char            zc_top_ds[MAXPATHLEN];
        uint64_t        zc_guid;
        uint64_t        zc_nvlist_conf;         /* really (char *) */
        uint64_t        zc_nvlist_conf_size;
@@ -352,7 +356,10 @@ extern int zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr);
 extern int zfs_secpolicy_rename_perms(const char *from,
     const char *to, cred_t *cr);
 extern int zfs_secpolicy_destroy_perms(const char *name, cred_t *cr);
-extern int zfs_unmount_snap(const char *, void *);
+extern int zfs_unmount_snap(const char *);
+extern void zfs_destroy_unmount_origin(const char *);
+
+extern boolean_t dataset_name_hidden(const char *name);
 
 enum zfsdev_state_type {
        ZST_ONEXIT,
@@ -361,7 +368,7 @@ enum zfsdev_state_type {
 };
 
 typedef struct zfsdev_state {
-        list_node_t             zs_next;        /* next zfsdev_state_t link */
+       list_node_t             zs_next;        /* next zfsdev_state_t link */
        struct file             *zs_file;       /* associated file struct */
        minor_t                 zs_minor;       /* made up minor number */
        void                    *zs_onexit;     /* onexit data */