X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzvol.c;h=61e22b8ecfaf947e3380ebc6adf86a208477c643;hb=23bdb07d4e4c435205d25d3efdb5fef2d089ce5e;hp=e4487f9a6a8dfd0882c3d0fc1c5da470177f9266;hpb=61e909608d15dc6900a710a0ceab6e101a68ac5a;p=zfs.git

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index e4487f9..61e22b8 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -58,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 */
@@ -132,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;
 	}
 
@@ -228,7 +228,7 @@ zvol_check_volsize(uint64_t volsize, uint64_t blocksize)
  * Ensure the zap is flushed then inform the VFS of the capacity change.
  */
 static int
-zvol_update_volsize(zvol_state_t *zv, uint64_t volsize)
+zvol_update_volsize(zvol_state_t *zv, uint64_t volsize, objset_t *os)
 {
 	struct block_device *bdev;
 	dmu_tx_t *tx;
@@ -236,7 +236,7 @@ zvol_update_volsize(zvol_state_t *zv, uint64_t volsize)
 
 	ASSERT(MUTEX_HELD(&zvol_state_lock));
 
-	tx = dmu_tx_create(zv->zv_objset);
+	tx = dmu_tx_create(os);
 	dmu_tx_hold_zap(tx, ZVOL_ZAP_OBJ, TRUE, NULL);
 	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
@@ -244,27 +244,35 @@ zvol_update_volsize(zvol_state_t *zv, uint64_t volsize)
 		return (error);
 	}
 
-	error = zap_update(zv->zv_objset, ZVOL_ZAP_OBJ, "size", 8, 1,
+	error = zap_update(os, ZVOL_ZAP_OBJ, "size", 8, 1,
 	    &volsize, tx);
 	dmu_tx_commit(tx);
 
 	if (error)
 		return (error);
 
-	error = dmu_free_long_range(zv->zv_objset,
+	error = dmu_free_long_range(os,
 	    ZVOL_OBJ, volsize, DMU_OBJECT_END);
 	if (error)
 		return (error);
 
-	zv->zv_volsize = volsize;
-	zv->zv_changed = 1;
-
 	bdev = bdget_disk(zv->zv_disk, 0);
 	if (!bdev)
-		return EIO;
+		return (EIO);
+/*
+ * 2.6.28 API change
+ * Added check_disk_size_change() helper function.
+ */
+#ifdef HAVE_CHECK_DISK_SIZE_CHANGE
+	set_capacity(zv->zv_disk, volsize >> 9);
+	zv->zv_volsize = volsize;
+	check_disk_size_change(zv->zv_disk, bdev);
+#else
+	zv->zv_volsize = volsize;
+	zv->zv_changed = 1;
+	(void) check_disk_change(bdev);
+#endif /* HAVE_CHECK_DISK_SIZE_CHANGE */
 
-	error = check_disk_change(bdev);
-	ASSERT3U(error, !=, 0);
 	bdput(bdev);
 
 	return (0);
@@ -311,7 +319,7 @@ zvol_set_volsize(const char *name, uint64_t volsize)
 		goto out_doi;
 	}
 
-	error = zvol_update_volsize(zv, volsize);
+	error = zvol_update_volsize(zv, volsize, os);
 out_doi:
 	kmem_free(doi, sizeof(dmu_object_info_t));
 out:
@@ -895,6 +903,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;
@@ -1058,7 +1069,7 @@ 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,
@@ -1073,7 +1084,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;
 
@@ -1274,7 +1286,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, "/");
@@ -1290,7 +1302,7 @@ zvol_remove_minors(const char *pool)
 		}
 	}
 	mutex_exit(&zvol_state_lock);
-	kmem_free(str, DISK_NAME_LEN);
+	kmem_free(str, MAXNAMELEN);
 }
 
 int