Author: delphij
Date: Tue Jun 25 21:44:48 2013
New Revision: 252215
URL: http://svnweb.freebsd.org/changeset/base/252215
Log:
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 14060:aeb4e8fef072
Illumos ZFS issues:
3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
Changes in other areas also in this revision:
Modified:
vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c Tue Jun 25
21:43:49 2013 (r252214)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c Tue Jun 25
21:44:48 2013 (r252215)
@@ -129,9 +129,6 @@ dsl_destroy_snapshot_check(void *arg, dm
if (pair != NULL)
return (fnvpair_value_int32(pair));
- if (nvlist_empty(dsda->dsda_successful_snaps))
- return (SET_ERROR(ENOENT));
-
return (0);
}
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Tue Jun 25
21:43:49 2013 (r252214)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Tue Jun 25
21:44:48 2013 (r252215)
@@ -126,10 +126,6 @@ dsl_dataset_user_hold_check(void *arg, d
}
}
- /* Return ENOENT if no holds would be created. */
- if (nvlist_empty(dduha->dduha_chkholds))
- return (SET_ERROR(ENOENT));
-
return (0);
}
@@ -468,10 +464,6 @@ dsl_dataset_user_release_check(void *arg
}
}
- /* Return ENOENT if none of the holds existed. */
- if (nvlist_empty(ddura->ddura_chkholds))
- return (SET_ERROR(ENOENT));
-
return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
