X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ioctl.c;h=6e8422bb03d7d8ced86e7e091f718a614366c805;hb=72d5e2da3e45a6865806f1be908232f5fea8787b;hp=2856ba7c427cd9949f4da42d699ccbf44b8ff64d;hpb=3ee56c292bbcd7e6b26e3c2ad8f0e50eee236bcc;p=zfs.git

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 2856ba7..6e8422b 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3291,7 +3291,7 @@ out:
 		dsl_dataset_rele(ds, FTAG);
 	return (error);
 #else
-	return (EOPNOTSUPP);
+	return (ENOTSUP);
 #endif /* HAVE_ZPL */
 }
 
@@ -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