summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2016-02-19 09:17:09 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2016-02-23 21:27:02 -0500
commit7af33612f4dae69d6a8c79fd9313c618e20b0f7c (patch)
treede81f44a4a6e5e1b726ca2e0b6c1987007e460dd
parentaa90f49036a6a9dd917c5f571497a28e6a6e5bcc (diff)
downloadlinux-7af33612f4dae69d6a8c79fd9313c618e20b0f7c.tar.bz2
scsi_dh_alua: remove 'rel_port' from alua_dh_data structure
The 'relative port' field is not used, and might get stale when the port group changes. So remove the field altogether. Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/device_handler/scsi_dh_alua.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index d02894dd027d..7a351cf19ed2 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -87,7 +87,6 @@ struct alua_port_group {
struct alua_dh_data {
struct alua_port_group *pg;
int group_id;
- int rel_port;
struct scsi_device *sdev;
activate_complete callback_fn;
void *callback_data;
@@ -325,12 +324,10 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h,
return SCSI_DH_NOMEM;
return SCSI_DH_DEV_UNSUPP;
}
- h->rel_port = rel_port;
-
sdev_printk(KERN_INFO, sdev,
"%s: device %s port group %x rel port %x\n",
ALUA_DH_NAME, h->pg->device_id_str,
- h->group_id, h->rel_port);
+ h->group_id, rel_port);
return alua_rtpg(sdev, h->pg);
}
@@ -762,7 +759,6 @@ static int alua_bus_attach(struct scsi_device *sdev)
if (!h)
return -ENOMEM;
h->pg = NULL;
- h->rel_port = -1;
h->sdev = sdev;
err = alua_initialize(sdev, h);