From 9c5e88b1ded19cb4b19b9d767d5c71b34c189540 Mon Sep 17 00:00:00 2001 From: Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> Date: Fri, 15 Feb 2019 15:41:38 -0500 Subject: zfs should optionally send holds Add -h switch to zfs send command to send dataset holds. If holds are present in the stream, zfs receive will create them on the target dataset, unless the zfs receive -h option is used to skip receive of holds. Reviewed-by: Alek Pinchuk Reviewed-by: loli10K Reviewed-by: Brian Behlendorf Reviewed by: Paul Dagnelie Signed-off-by: Paul Zuchowski Closes #7513 --- include/sys/zfs_ioctl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/sys/zfs_ioctl.h') diff --git a/include/sys/zfs_ioctl.h b/include/sys/zfs_ioctl.h index a552fad37..f8c65f581 100644 --- a/include/sys/zfs_ioctl.h +++ b/include/sys/zfs_ioctl.h @@ -106,6 +106,7 @@ typedef enum drr_headertype { #define DMU_BACKUP_FEATURE_LARGE_DNODE (1 << 23) #define DMU_BACKUP_FEATURE_RAW (1 << 24) /* flag #25 is reserved for the ZSTD compression feature */ +#define DMU_BACKUP_FEATURE_HOLDS (1 << 26) /* * Mask of all supported backup features @@ -115,7 +116,7 @@ typedef enum drr_headertype { DMU_BACKUP_FEATURE_EMBED_DATA | DMU_BACKUP_FEATURE_LZ4 | \ DMU_BACKUP_FEATURE_RESUMING | DMU_BACKUP_FEATURE_LARGE_BLOCKS | \ DMU_BACKUP_FEATURE_COMPRESSED | DMU_BACKUP_FEATURE_LARGE_DNODE | \ - DMU_BACKUP_FEATURE_RAW) + DMU_BACKUP_FEATURE_RAW | DMU_BACKUP_FEATURE_HOLDS) /* Are all features in the given flag word currently supported? */ #define DMU_STREAM_SUPPORTED(x) (!((x) & ~DMU_BACKUP_FEATURE_MASK)) -- cgit v1.2.3