Rename update-zfs.sh -> zfs-update.sh for consistency

[zfs.git] / module / zcommon / include / sys / fs / zfs.h

diff --git a/module/zcommon/include/sys/fs/zfs.h b/module/zcommon/include/sys/fs/zfs.h
index 6651b14..86b36a8 100644 (file)
--- a/module/zcommon/include/sys/fs/zfs.h
+++ b/module/zcommon/include/sys/fs/zfs.h
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -26,6 +27,8 @@
 #ifndef        _SYS_FS_ZFS_H
 #define        _SYS_FS_ZFS_H
 
+#include <sys/time.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -111,6 +114,8 @@ typedef enum {
        ZFS_PROP_USEDREFRESERV,
        ZFS_PROP_USERACCOUNTING,        /* not exposed to the user */
        ZFS_PROP_STMF_SHAREINFO,        /* not exposed to the user */
+       ZFS_PROP_DEFER_DESTROY,
+       ZFS_PROP_USERREFS,
        ZFS_NUM_PROPS
 } zfs_prop_t;
 
@@ -280,14 +285,16 @@ typedef enum zfs_cache_type {
 #define        SPA_VERSION_14                  14ULL
 #define        SPA_VERSION_15                  15ULL
 #define        SPA_VERSION_16                  16ULL
+#define        SPA_VERSION_17                  17ULL
+#define        SPA_VERSION_18                  18ULL
 /*
  * When bumping up SPA_VERSION, make sure GRUB ZFS understands the on-disk
  * format change. Go to usr/src/grub/grub-0.97/stage2/{zfs-include/, fsys_zfs*},
  * and do the appropriate changes.  Also bump the version number in
  * usr/src/grub/capability.
  */
-#define        SPA_VERSION                     SPA_VERSION_16
-#define        SPA_VERSION_STRING              "16"
+#define        SPA_VERSION                     SPA_VERSION_18
+#define        SPA_VERSION_STRING              "18"
 
 /*
  * Symbolic names for the changes that caused a SPA_VERSION switch.
@@ -303,7 +310,7 @@ typedef enum zfs_cache_type {
 #define        SPA_VERSION_INITIAL             SPA_VERSION_1
 #define        SPA_VERSION_DITTO_BLOCKS        SPA_VERSION_2
 #define        SPA_VERSION_SPARES              SPA_VERSION_3
-#define        SPA_VERSION_RAID6               SPA_VERSION_3
+#define        SPA_VERSION_RAIDZ2              SPA_VERSION_3
 #define        SPA_VERSION_BPLIST_ACCOUNT      SPA_VERSION_3
 #define        SPA_VERSION_RAIDZ_DEFLATE       SPA_VERSION_3
 #define        SPA_VERSION_DNODE_BYTES         SPA_VERSION_3
@@ -325,6 +332,8 @@ typedef enum zfs_cache_type {
 #define        SPA_VERSION_PASSTHROUGH_X       SPA_VERSION_14
 #define        SPA_VERSION_USERSPACE           SPA_VERSION_15
 #define        SPA_VERSION_STMF_PROP           SPA_VERSION_16
+#define        SPA_VERSION_RAIDZ3              SPA_VERSION_17
+#define        SPA_VERSION_USERREFS            SPA_VERSION_18
 
 /*
  * ZPL version - rev'd whenever an incompatible on-disk format change
@@ -601,7 +610,10 @@ typedef enum zfs_ioc {
        ZFS_IOC_SMB_ACL,
        ZFS_IOC_USERSPACE_ONE,
        ZFS_IOC_USERSPACE_MANY,
-       ZFS_IOC_USERSPACE_UPGRADE
+       ZFS_IOC_USERSPACE_UPGRADE,
+       ZFS_IOC_HOLD,
+       ZFS_IOC_RELEASE,
+       ZFS_IOC_GET_HOLDS
 } zfs_ioc_t;
 
 /*
@@ -715,6 +727,8 @@ typedef enum history_internal_events {
        LOG_DS_REFQUOTA,
        LOG_DS_REFRESERV,
        LOG_POOL_SCRUB_DONE,
+       LOG_DS_USER_HOLD,
+       LOG_DS_USER_RELEASE,
        LOG_END
 } history_internal_events_t;