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

Commit f3f01730 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

hpsa: add function is_logical_device 



simplify checking for logical/physical devices

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarJustin Lindley <justin.lindley@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 04fa2f44

drivers/scsi/hpsa.c

+12 −7
Original line number Diff line number Diff line
@@ -618,6 +618,11 @@ static const char * const raid_label[] = { "0", "4", "1(+0)", "5", "5+1", "6", 
#define HPSA_RAID_ADM	6	/* also used for RAID 1+0 ADM */

#define RAID_UNKNOWN (ARRAY_SIZE(raid_label) - 1)



static inline bool is_logical_device(struct hpsa_scsi_dev_t *device)

{

	return !device->physical_device;

}



static ssize_t raid_level_show(struct device *dev,

	     struct device_attribute *attr, char *buf)

{
@@ -638,7 +643,7 @@ static ssize_t raid_level_show(struct device *dev, 
	}



	/* Is this even a logical drive? */

	if (!is_logical_dev_addr_mode(hdev->scsi3addr)) {

	if (!is_logical_device(hdev)) {

		spin_unlock_irqrestore(&h->lock, flags);

		l = snprintf(buf, PAGE_SIZE, "N/A\n");

		return l;
@@ -772,8 +777,8 @@ static ssize_t path_info_show(struct device *dev, 
				scsi_device_type(hdev->devtype));



		if (is_ext_target(h, hdev) ||

			(hdev->devtype == TYPE_RAID) ||

			is_logical_dev_addr_mode(hdev->scsi3addr)) {

			hdev->devtype == TYPE_RAID ||

			is_logical_device(hdev)) {

			output_len += snprintf(path[i] + output_len,

						PATH_STRING_LEN, "%s\n",

						active);
@@ -1587,7 +1592,7 @@ static void hpsa_figure_phys_disk_ptrs(struct ctlr_info *h, 
				continue;

			if (dev[j]->devtype != TYPE_DISK)

				continue;

			if (is_logical_dev_addr_mode(dev[j]->scsi3addr))

			if (is_logical_device(dev[j]))

				continue;

			if (dev[j]->ioaccel_handle != dd[i].ioaccel_handle)

				continue;
@@ -1632,7 +1637,7 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h, 
			continue;

		if (dev[i]->devtype != TYPE_DISK)

			continue;

		if (!is_logical_dev_addr_mode(dev[i]->scsi3addr))

		if (!is_logical_device(dev[i]))

			continue;



		/*
@@ -2237,7 +2242,7 @@ static void process_ioaccel2_completion(struct ctlr_info *h, 
	 * the normal I/O path so the controller can handle whatever's

	 * wrong.

	 */

	if (is_logical_dev_addr_mode(dev->scsi3addr) &&

	if (is_logical_device(dev) &&

		c2->error_data.serv_response ==

			IOACCEL2_SERV_RESPONSE_FAILURE) {

		if (c2->error_data.status ==
@@ -2357,7 +2362,7 @@ static void complete_scsi_command(struct CommandList *cp) 
		 * the normal I/O path so the controller can handle whatever's

		 * wrong.

		 */

		if (is_logical_dev_addr_mode(dev->scsi3addr)) {

		if (is_logical_device(dev)) {

			if (ei->CommandStatus == CMD_IOACCEL_DISABLED)

				dev->offload_enabled = 0;

			return hpsa_retry_cmd(h, cp);