summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-06-24 14:50:20 -0700
committerBrian Behlendorf <[email protected]>2016-06-24 15:14:27 -0700
commit669cf0ab298dd66e512b37f6c4a42aee2d767b80 (patch)
tree0677fdcb4e194c2c9452381702ae62d439cb2865
parent50c957f702ea6d08a634e42f73e8a49931dd8055 (diff)
Sync DMU_BACKUP_FEATURE_* flags
Flag 20 was used in OpenZFS as DMU_BACKUP_FEATURE_RESUMING. The DMU_BACKUP_FEATURE_LARGE_DNODE flag must be shifted to 21 and then reserved in the upstream OpenZFS implementation. Signed-off-by: Brian Behlendorf <[email protected]> Signed-off-by: Ned Bass <[email protected]> Closes #4795
-rw-r--r--include/sys/zfs_ioctl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h
index 301f83232..a978524e2 100644
--- a/include/sys/zfs_ioctl.h
+++ b/include/sys/zfs_ioctl.h
@@ -98,7 +98,8 @@ typedef enum drr_headertype {
#define DMU_BACKUP_FEATURE_EMBED_DATA_LZ4 (1<<17)
/* flag #18 is reserved for a Delphix feature */
#define DMU_BACKUP_FEATURE_LARGE_BLOCKS (1<<19)
-#define DMU_BACKUP_FEATURE_LARGE_DNODE (1<<20)
+/* flag #20 is reserved for resumable streams */
+#define DMU_BACKUP_FEATURE_LARGE_DNODE (1<<21)
/*
* Mask of all supported backup features