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

Commit 065f9716 authored by Dan Carpenter's avatar Dan Carpenter Committed by James Bottomley
Browse files

[SCSI] target: Convert rd_build_device_space() to use errno 



This patch converts rd_build_device_space() to return errno usage
for failures in rd_create_virtdevice().

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarNicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 35ce9e26

drivers/target/target_core_rd.c

+7 −8
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) 
	if (rd_dev->rd_page_count <= 0) {

		printk(KERN_ERR "Illegal page count: %u for Ramdisk device\n",

			rd_dev->rd_page_count);

		return -1;

		return -EINVAL;

	}

	total_sg_needed = rd_dev->rd_page_count;
@@ -160,7 +160,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) 
	if (!(sg_table)) {

		printk(KERN_ERR "Unable to allocate memory for Ramdisk"

			" scatterlist tables\n");

		return -1;

		return -ENOMEM;

	}



	rd_dev->sg_table_array = sg_table;
@@ -175,7 +175,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) 
		if (!(sg)) {

			printk(KERN_ERR "Unable to allocate scatterlist array"

				" for struct rd_dev\n");

			return -1;

			return -ENOMEM;

		}



		sg_init_table((struct scatterlist *)&sg[0], sg_per_table);
@@ -191,7 +191,7 @@ static int rd_build_device_space(struct rd_dev *rd_dev) 
			if (!(pg)) {

				printk(KERN_ERR "Unable to allocate scatterlist"

					" pages for struct rd_dev_sg_table\n");

				return -1;

				return -ENOMEM;

			}

			sg_assign_page(&sg[j], pg);

			sg[j].length = PAGE_SIZE;
@@ -253,15 +253,14 @@ static struct se_device *rd_create_virtdevice( 
	struct se_dev_limits dev_limits;

	struct rd_dev *rd_dev = p;

	struct rd_host *rd_host = hba->hba_ptr;

	int dev_flags = 0, ret = -EINVAL;

	int dev_flags = 0, ret;

	char prod[16], rev[4];



	memset(&dev_limits, 0, sizeof(struct se_dev_limits));



	if (rd_build_device_space(rd_dev) < 0) {

		ret = -ENOMEM;

	ret = rd_build_device_space(rd_dev);

	if (ret < 0)

		goto fail;

	}



	snprintf(prod, 16, "RAMDISK-%s", (rd_dev->rd_direct) ? "DR" : "MCP");

	snprintf(rev, 4, "%s", (rd_dev->rd_direct) ? RD_DR_VERSION :