From 669cf0ab298dd66e512b37f6c4a42aee2d767b80 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 24 Jun 2016 14:50:20 -0700 Subject: [PATCH] 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 Signed-off-by: Ned Bass Closes #4795 --- include/sys/zfs_ioctl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h index 301f83232bd2..a978524e2400 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