X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ioctl.c;h=6e8422bb03d7d8ced86e7e091f718a614366c805;hb=1ee1b76786aebc6eed546c6e869cc88f1e318890;hp=cc5e66f9a05ab0ab34a4433e591b1db2cde4588a;hpb=f5e79474f07ec7a2035da2e139885a046ad70066;p=zfs.git

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index cc5e66f..6e8422b 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3307,6 +3307,7 @@ static int
 zfs_ioc_rename(zfs_cmd_t *zc)
 {
 	boolean_t recursive = zc->zc_cookie & 1;
+	int err;
 
 	zc->zc_value[sizeof (zc->zc_value) - 1] = '\0';
 	if (dataset_namecheck(zc->zc_value, NULL, NULL) != 0 ||
@@ -3320,13 +3321,18 @@ zfs_ioc_rename(zfs_cmd_t *zc)
 	 */
 	if (!recursive && strchr(zc->zc_name, '@') != NULL &&
 	    zc->zc_objset_type == DMU_OST_ZFS) {
-		int err = zfs_unmount_snap(zc->zc_name, NULL);
+		err = zfs_unmount_snap(zc->zc_name, NULL);
 		if (err)
 			return (err);
 	}
-	if (zc->zc_objset_type == DMU_OST_ZVOL)
+
+	err = dmu_objset_rename(zc->zc_name, zc->zc_value, recursive);
+	if ((err == 0) && (zc->zc_objset_type == DMU_OST_ZVOL)) {
 		(void) zvol_remove_minor(zc->zc_name);
-	return (dmu_objset_rename(zc->zc_name, zc->zc_value, recursive));
+		(void) zvol_create_minor(zc->zc_value);
+	}
+
+	return (err);
 }
 
 static int
@@ -4741,11 +4747,12 @@ zfs_ioc_events_next(zfs_cmd_t *zc)
 		return (error);
 
 	do {
-		error = zfs_zevent_next(ze, &event, &dropped);
+		error = zfs_zevent_next(ze, &event,
+			&zc->zc_nvlist_dst_size, &dropped);
 		if (event != NULL) {
 			zc->zc_cookie = dropped;
 			error = put_nvlist(zc, event);
-		        nvlist_free(event);
+			nvlist_free(event);
 		}
 
 		if (zc->zc_guid & ZEVENT_NONBLOCK)