diff options
| author | mm <mm@FreeBSD.org> | 2012-08-28 12:25:37 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-08-28 12:25:37 +0000 |
| commit | d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8 (patch) | |
| tree | de7860b2979788424d3d99e83f3eac4757202a08 /cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | |
| parent | dc45fbdfb7bda54267530493482e960f5a622636 (diff) | |
| download | FreeBSD-src-d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8.zip FreeBSD-src-d9fa2f486ee98b2557e1d5ad5f1af418c663cfc8.tar.gz | |
Merge recent vendor changes:
3100 zvol rename fails with EBUSY when dirty
3104 eliminate empty bpobjs
3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc
References:
https://www.illumos.org/issues/3100
https://www.illumos.org/issues/3104
https://www.illumos.org/issues/3120
Obtained from: illumos (vendor/illumos, vendor/illumos-sys)
MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c index 63c2a05..8ce5030 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c @@ -3546,7 +3546,7 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force) zhp->zfs_type == ZFS_TYPE_VOLUME); /* - * Destroy all recent snapshots and its dependends. + * Destroy all recent snapshots and their dependents. */ cb.cb_force = force; cb.cb_target = snap->zfs_name; |
