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

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

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

drivers/scsi/device_handler/scsi_dh_alua.c

+1 −5
Original line number Diff line number Diff line
@@ -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);