X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzvol.c;h=65a9240577c06aad84c0cd0edca6d283ed373a48;hb=53cf50e0816a89749b3ea4d51d5d9c9605bcc3e8;hp=b2a08fb437c62a7e4a8160ca1a4f3b06bf7518c7;hpb=b1c58213751141f28793e723017d4064893d819a;p=zfs.git

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index b2a08fb..65a9240 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -44,6 +44,7 @@
 #include <sys/zfs_rlock.h>
 #include <sys/zfs_znode.h>
 #include <sys/zvol.h>
+#include <linux/blkdev_compat.h>
 
 unsigned int zvol_major = ZVOL_MAJOR;
 unsigned int zvol_threads = 0;
@@ -57,7 +58,7 @@ static char *zvol_tag = "zvol_tag";
  * The in-core state of each volume.
  */
 typedef struct zvol_state {
-	char			zv_name[DISK_NAME_LEN];	/* name */
+	char			zv_name[MAXNAMELEN];	/* name */
 	uint64_t		zv_volsize;	/* advertised space */
 	uint64_t		zv_volblocksize;/* volume block size */
 	objset_t		*zv_objset;	/* objset handle */
@@ -131,7 +132,7 @@ zvol_find_by_name(const char *name)
 	ASSERT(MUTEX_HELD(&zvol_state_lock));
 	for (zv = list_head(&zvol_state_list); zv != NULL;
 	     zv = list_next(&zvol_state_list, zv)) {
-		if (!strncmp(zv->zv_name, name, DISK_NAME_LEN))
+		if (!strncmp(zv->zv_name, name, MAXNAMELEN))
 			return zv;
 	}
 
@@ -894,6 +895,9 @@ zvol_ioctl(struct block_device *bdev, fmode_t mode,
 	case BLKFLSBUF:
 		zil_commit(zv->zv_zilog, ZVOL_OBJ);
 		break;
+	case BLKZNAME:
+		error = copy_to_user((void *)arg, zv->zv_name, MAXNAMELEN);
+		break;
 
 	default:
 		error = -ENOTTY;
@@ -1057,11 +1061,13 @@ zvol_alloc(dev_t dev, const char *name)
 	zv->zv_queue->queuedata = zv;
 	zv->zv_dev = dev;
 	zv->zv_open_count = 0;
-	strlcpy(zv->zv_name, name, DISK_NAME_LEN);
+	strlcpy(zv->zv_name, name, MAXNAMELEN);
 
 	mutex_init(&zv->zv_znode.z_range_lock, NULL, MUTEX_DEFAULT, NULL);
 	avl_create(&zv->zv_znode.z_range_avl, zfs_range_compare,
 	    sizeof (rl_t), offsetof(rl_t, r_node));
+	zv->zv_znode.z_is_zvol = TRUE;
+
 	spin_lock_init(&zv->zv_lock);
 	list_link_init(&zv->zv_next);
 
@@ -1070,7 +1076,8 @@ zvol_alloc(dev_t dev, const char *name)
 	zv->zv_disk->fops = &zvol_ops;
 	zv->zv_disk->private_data = zv;
 	zv->zv_disk->queue = zv->zv_queue;
-	snprintf(zv->zv_disk->disk_name, DISK_NAME_LEN, "%s", name);
+	snprintf(zv->zv_disk->disk_name, DISK_NAME_LEN, "%s%d",
+	    ZVOL_DEV_NAME, (dev & MINORMASK));
 
 	return zv;
 
@@ -1228,7 +1235,8 @@ zvol_create_minors_cb(spa_t *spa, uint64_t dsobj,
 	if (strchr(dsname, '/') == NULL)
 		return 0;
 
-	return __zvol_create_minor(dsname);
+	(void) __zvol_create_minor(dsname);
+	return (0);
 }
 
 /*
@@ -1270,7 +1278,7 @@ zvol_remove_minors(const char *pool)
 	zvol_state_t *zv, *zv_next;
 	char *str;
 
-	str = kmem_zalloc(DISK_NAME_LEN, KM_SLEEP);
+	str = kmem_zalloc(MAXNAMELEN, KM_SLEEP);
 	if (pool) {
 		(void) strncpy(str, pool, strlen(pool));
 		(void) strcat(str, "/");
@@ -1286,7 +1294,7 @@ zvol_remove_minors(const char *pool)
 		}
 	}
 	mutex_exit(&zvol_state_lock);
-	kmem_free(str, DISK_NAME_LEN);
+	kmem_free(str, MAXNAMELEN);
 }
 
 int