ZFS_IOC_RECV should only call zvol_create_minors() on zvols

Signed-off-by: Richard Yao <ryao@gentoo.org>
ryao · Jun 27, 2014 · 4398c54 · 4398c54
1 parent 6e2f1ce
commit 4398c54
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
@@ -4037,8 +4037,17 @@ zfs_ioc_recv(zfs_cmd_t *zc)
 #endif
 
 #ifdef _KERNEL
-	if (error == 0)
-		zvol_create_minors(tofs);
+	if (error == 0) {
+		objset_t *os;
+		boolean_t iszvol;
+
+		dmu_objset_hold(tofs, FTAG, &os);
+		iszvol = (dmu_objset_type(os) == DMU_OST_ZVOL);
+		dmu_objset_rele(os, FTAG);
+
+		if (iszvol)
+			zvol_create_minors(tofs);
+	}
 #endif
 
 	/*