Replace ZPROP_INVAL with ZPROP_USERPROP where it means a user property

[mirror_zfs.git] / include / sys / fs / zfs.h

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index f9fd5cf676e2f70ba1208f58543077bab0d221b3..f013e6b2060327deb6be82762bc315f08646e940 100644 (file)
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -93,6 +93,7 @@ typedef enum dmu_objset_type {
 typedef enum {
        ZPROP_CONT = -2,
        ZPROP_INVAL = -1,
+       ZPROP_USERPROP = ZPROP_INVAL,
        ZFS_PROP_TYPE = 0,
        ZFS_PROP_CREATION,
        ZFS_PROP_USED,
@@ -310,7 +311,7 @@ typedef int (*zprop_func)(int, void *);
  */
 typedef enum {
        VDEV_PROP_INVAL = -1,
-#define        VDEV_PROP_USER  VDEV_PROP_INVAL
+       VDEV_PROP_USERPROP = VDEV_PROP_INVAL,
        VDEV_PROP_NAME,
        VDEV_PROP_CAPACITY,
        VDEV_PROP_STATE,
@@ -1292,6 +1293,7 @@ typedef struct ddt_histogram {
 #define        ZVOL_DRIVER     "zvol"
 #define        ZFS_DRIVER      "zfs"
 #define        ZFS_DEV         "/dev/zfs"
+#define        ZFS_DEVDIR      "/dev"
 
 #define        ZFS_SUPER_MAGIC 0x2fc12fc1
 
@@ -1449,7 +1451,9 @@ typedef enum zfs_ioc {
        ZFS_IOC_EVENTS_SEEK,                    /* 0x83 (Linux) */
        ZFS_IOC_NEXTBOOT,                       /* 0x84 (FreeBSD) */
        ZFS_IOC_JAIL,                           /* 0x85 (FreeBSD) */
+       ZFS_IOC_USERNS_ATTACH = ZFS_IOC_JAIL,   /* 0x85 (Linux) */
        ZFS_IOC_UNJAIL,                         /* 0x86 (FreeBSD) */
+       ZFS_IOC_USERNS_DETACH = ZFS_IOC_UNJAIL, /* 0x86 (Linux) */
        ZFS_IOC_SET_BOOTENV,                    /* 0x87 */
        ZFS_IOC_GET_BOOTENV,                    /* 0x88 */
        ZFS_IOC_LAST
@@ -1530,6 +1534,7 @@ typedef enum {
        ZFS_ERR_REBUILD_IN_PROGRESS,
        ZFS_ERR_BADPROP,
        ZFS_ERR_VDEV_NOTSUP,
+       ZFS_ERR_NOT_USER_NAMESPACE,
 } zfs_errno_t;
 
 /*