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

Commit 675195d0 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: scsi_transport_fc: set scsi_target_id upon rescan 



When an rport is found in the bindings array there is no guarantee that
it had been a target port, so we need to call fc_remote_port_rolechg()
here to ensure the scsi_target_id is set correctly.  Otherwise the port
will never be scanned.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Tested-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c88f0e6b

drivers/scsi/scsi_transport_fc.c

+1 −10
Original line number Diff line number Diff line
@@ -2876,7 +2876,6 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel, 
			memcpy(&rport->port_name, &ids->port_name,

				sizeof(rport->port_name));

			rport->port_id = ids->port_id;

			rport->roles = ids->roles;

			rport->port_state = FC_PORTSTATE_ONLINE;

			rport->flags &= ~FC_RPORT_FAST_FAIL_TIMEDOUT;
@@ -2885,15 +2884,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel, 
						fci->f->dd_fcrport_size);

			spin_unlock_irqrestore(shost->host_lock, flags);



			if (ids->roles & FC_PORT_ROLE_FCP_TARGET) {

				scsi_target_unblock(&rport->dev, SDEV_RUNNING);



				/* initiate a scan of the target */

				spin_lock_irqsave(shost->host_lock, flags);

				rport->flags |= FC_RPORT_SCAN_PENDING;

				scsi_queue_work(shost, &rport->scan_work);

				spin_unlock_irqrestore(shost->host_lock, flags);

			}

			fc_remote_port_rolechg(rport, ids->roles);

			return rport;

		}

	}