From c5affee6a3a59d69c44d3493fa98bec9080bb11f Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 30 Jul 2013 21:02:09 +0000 Subject: MFV r253781 + r253871: Illumos ZFS issues: 3894 zfs should not allow snapshot of inconsistent dataset MFC after: 2 weeks --- cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cddl/contrib/opensolaris/cmd') diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index b35d272..425f391 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -3530,6 +3530,12 @@ zfs_snapshot_cb(zfs_handle_t *zhp, void *arg) int rv = 0; int error; + if (sd->sd_recursive && + zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) != 0) { + zfs_close(zhp); + return (0); + } + error = asprintf(&name, "%s@%s", zfs_get_name(zhp), sd->sd_snapname); if (error == -1) nomem(); -- cgit v1.1