Commit 7af33612 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen

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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent aa90f490
...@@ -87,7 +87,6 @@ struct alua_port_group { ...@@ -87,7 +87,6 @@ struct alua_port_group {
struct alua_dh_data { struct alua_dh_data {
struct alua_port_group *pg; struct alua_port_group *pg;
int group_id; int group_id;
int rel_port;
struct scsi_device *sdev; struct scsi_device *sdev;
activate_complete callback_fn; activate_complete callback_fn;
void *callback_data; void *callback_data;
...@@ -325,12 +324,10 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, ...@@ -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_NOMEM;
return SCSI_DH_DEV_UNSUPP; return SCSI_DH_DEV_UNSUPP;
} }
h->rel_port = rel_port;
sdev_printk(KERN_INFO, sdev, sdev_printk(KERN_INFO, sdev,
"%s: device %s port group %x rel port %x\n", "%s: device %s port group %x rel port %x\n",
ALUA_DH_NAME, h->pg->device_id_str, 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); return alua_rtpg(sdev, h->pg);
} }
...@@ -762,7 +759,6 @@ static int alua_bus_attach(struct scsi_device *sdev) ...@@ -762,7 +759,6 @@ static int alua_bus_attach(struct scsi_device *sdev)
if (!h) if (!h)
return -ENOMEM; return -ENOMEM;
h->pg = NULL; h->pg = NULL;
h->rel_port = -1;
h->sdev = sdev; h->sdev = sdev;
err = alua_initialize(sdev, h); err = alua_initialize(sdev, h);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment