Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e0d7526 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: tcmu: use u64 for dev_size 



We use unsigned long, size_t and u64 for dev_size. This has us standardize
on u64.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b60cb1f8

drivers/target/target_core_user.c

+8 −13
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct tcmu_dev { 
	struct inode *inode;



	struct tcmu_mailbox *mb_addr;

	size_t dev_size;

	uint64_t dev_size;

	u32 cmdr_size;

	u32 cmdr_last_cleaned;

	/* Offset of data area from start of mb */
@@ -2016,7 +2016,7 @@ enum { 


static match_table_t tokens = {

	{Opt_dev_config, "dev_config=%s"},

	{Opt_dev_size, "dev_size=%u"},

	{Opt_dev_size, "dev_size=%s"},

	{Opt_hw_block_size, "hw_block_size=%d"},

	{Opt_hw_max_sectors, "hw_max_sectors=%d"},

	{Opt_nl_reply_supported, "nl_reply_supported=%d"},
@@ -2083,7 +2083,7 @@ static ssize_t tcmu_set_configfs_dev_params(struct se_device *dev, 
		const char *page, ssize_t count)

{

	struct tcmu_dev *udev = TCMU_DEV(dev);

	char *orig, *ptr, *opts, *arg_p;

	char *orig, *ptr, *opts;

	substring_t args[MAX_OPT_ARGS];

	int ret = 0, token;
@@ -2108,15 +2108,10 @@ static ssize_t tcmu_set_configfs_dev_params(struct se_device *dev, 
			pr_debug("TCMU: Referencing Path: %s\n", udev->dev_config);

			break;

		case Opt_dev_size:

			arg_p = match_strdup(&args[0]);

			if (!arg_p) {

				ret = -ENOMEM;

				break;

			}

			ret = kstrtoul(arg_p, 0, (unsigned long *) &udev->dev_size);

			kfree(arg_p);

			ret = match_u64(&args[0], &udev->dev_size);

			if (ret < 0)

				pr_err("kstrtoul() failed for dev_size=\n");

				pr_err("match_u64() failed for dev_size=. Error %d.\n",

				       ret);

			break;

		case Opt_hw_block_size:

			ret = tcmu_set_dev_attrib(&args[0],
@@ -2154,7 +2149,7 @@ static ssize_t tcmu_show_configfs_dev_params(struct se_device *dev, char *b) 


	bl = sprintf(b + bl, "Config: %s ",

		     udev->dev_config[0] ? udev->dev_config : "NULL");

	bl += sprintf(b + bl, "Size: %zu ", udev->dev_size);

	bl += sprintf(b + bl, "Size: %llu ", udev->dev_size);

	bl += sprintf(b + bl, "MaxDataAreaMB: %u\n",

		      TCMU_BLOCKS_TO_MBS(udev->max_blocks));
@@ -2323,7 +2318,7 @@ static ssize_t tcmu_dev_size_show(struct config_item *item, char *page) 
						struct se_dev_attrib, da_group);

	struct tcmu_dev *udev = TCMU_DEV(da->da_dev);



	return snprintf(page, PAGE_SIZE, "%zu\n", udev->dev_size);

	return snprintf(page, PAGE_SIZE, "%llu\n", udev->dev_size);

}



static int tcmu_send_dev_size_event(struct tcmu_dev *udev, u64 size)