diff options
| author | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
| commit | c5affee6a3a59d69c44d3493fa98bec9080bb11f (patch) | |
| tree | 23a5763925ca6f88812017c8afbc82918ed35156 /cddl/contrib/opensolaris/cmd | |
| parent | ef92cf9910e5912fe431aaad8b444da2aaae9741 (diff) | |
| download | FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.zip FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.tar.gz | |
MFV r253781 + r253871:
Illumos ZFS issues:
3894 zfs should not allow snapshot of inconsistent dataset
MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
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(); |
