svn commit: r284302 - vendor-sys/illumos/dist/uts/common/fs/zfs

Andriy Gapon avg at FreeBSD.org
Fri Jun 12 10:50:32 UTC 2015


Author: avg
Date: Fri Jun 12 10:50:31 2015
New Revision: 284302
URL: https://svnweb.freebsd.org/changeset/base/284302

Log:
  Revert r284031: the change was already imported in r283534

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Fri Jun 12 10:41:24 2015	(r284301)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Fri Jun 12 10:50:31 2015	(r284302)
@@ -5132,19 +5132,6 @@ zfs_ioc_hold(const char *pool, nvlist_t 
 			return (SET_ERROR(EINVAL));
 	}
 
-	/* make sure the user didn't pass us any invalid (empty) tags */
-	for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(holds, pair)) {
-		char *htag;
-
-		error = nvpair_value_string(pair, &htag);
-		if (error != 0)
-			return (SET_ERROR(error));
-
-		if (strlen(htag) == 0)
-			return (SET_ERROR(EINVAL));
-	}
-
 	if (nvlist_lookup_int32(args, "cleanup_fd", &cleanup_fd) == 0) {
 		error = zfs_onexit_fd_hold(cleanup_fd, &minor);
 		if (error != 0)


More information about the svn-src-all mailing list