summaryrefslogtreecommitdiff
path: root/usr/src/common
diff options
context:
space:
mode:
authorMatthew Ahrens <mahrens@delphix.com>2015-10-09 21:56:01 -0700
committerMatthew Ahrens <mahrens@delphix.com>2015-10-09 21:56:01 -0700
commit9c3fd1216fa7fb02cfbc78a2518a686d54b48ab8 (patch)
tree38f7ac42de9d29c9fb4f3d8dfe79416f6db7c6d6 /usr/src/common
parent89fdfac39633dc6769133c82b68b1ed74c2bc54b (diff)
downloadillumos-joyent-9c3fd1216fa7fb02cfbc78a2518a686d54b48ab8.tar.gz
2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed by: Xin Li <delphij@freebsd.org> Reviewed by: Arne Jansen <sensille@gmx.net> Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/common')
-rw-r--r--usr/src/common/zfs/zfs_prop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c
index 11abc0d46f..0d486708ae 100644
--- a/usr/src/common/zfs/zfs_prop.c
+++ b/usr/src/common/zfs/zfs_prop.c
@@ -342,6 +342,10 @@ zfs_prop_init(void)
zprop_register_string(ZFS_PROP_MLSLABEL, "mlslabel",
ZFS_MLSLABEL_DEFAULT, PROP_INHERIT, ZFS_TYPE_DATASET,
"<sensitivity label>", "MLSLABEL");
+ zprop_register_string(ZFS_PROP_RECEIVE_RESUME_TOKEN,
+ "receive_resume_token",
+ NULL, PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+ "<string token>", "RESUMETOK");
/* readonly number properties */
zprop_register_number(ZFS_PROP_USED, "used", 0, PROP_READONLY,