X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzvol.c;h=b516156372448a286f8e68c761314048d8334ac4;hb=refs%2Fheads%2Frertzinger%2Ffeature-zpool-get--p;hp=97b65c815e349d154d6963af33f83049d7e917f9;hpb=2a3871d4bcc65dff7be4c9b55cb863421ddc8c3a;p=zfs.git

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 97b65c8..b516156 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -1024,7 +1024,11 @@ out_mutex:
 	return (error);
 }
 
+#ifdef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
+static void
+#else
 static int
+#endif
 zvol_release(struct gendisk *disk, fmode_t mode)
 {
 	zvol_state_t *zv = disk->private_data;
@@ -1044,7 +1048,9 @@ zvol_release(struct gendisk *disk, fmode_t mode)
 	if (drop_mutex)
 		mutex_exit(&zvol_state_lock);
 
+#ifndef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
 	return (0);
+#endif
 }
 
 static int
@@ -1582,8 +1588,6 @@ zvol_init(void)
 	blk_register_region(MKDEV(zvol_major, 0), 1UL << MINORBITS,
 	                    THIS_MODULE, zvol_probe, NULL, NULL);
 
-	(void) zvol_create_minors(NULL);
-
 	return (0);
 
 out2: