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

Commit 1d69b122 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: fc: provide fc_bsg_to_rport() helper 



Provide fc_bsg_to_rport() helper that will become handy when we're
moving from struct fc_bsg_job to a plain struct bsg_job. Also move all
LLDDs to use the new helper.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cd21c605

drivers/s390/scsi/zfcp_fc.c

+5 −3
Original line number Diff line number Diff line
@@ -901,12 +901,13 @@ static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job) 
	u8 gs_type;

	struct zfcp_adapter *adapter;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_rport *rport = fc_bsg_to_rport(job);

	struct Scsi_Host *shost;



	preamble_word1 = bsg_request->rqst_data.r_ct.preamble_word1;

	gs_type = (preamble_word1 & 0xff000000) >> 24;



	shost = fc_bsg_to_shost(job);

	shost = rport ? rport_to_shost(rport) : fc_bsg_to_shost(job);

	adapter = (struct zfcp_adapter *) shost->hostdata[0];



	switch (gs_type) {
@@ -940,7 +941,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job, 
				struct zfcp_adapter *adapter)

{

	struct zfcp_fsf_ct_els *els = job->dd_data;

	struct fc_rport *rport = job->rport;

	struct fc_rport *rport = fc_bsg_to_rport(job);

	struct fc_bsg_request *bsg_request = job->request;

	struct zfcp_port *port;

	u32 d_id;
@@ -988,8 +989,9 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) 
	struct zfcp_adapter *adapter;

	struct zfcp_fsf_ct_els *ct_els = job->dd_data;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_rport *rport = fc_bsg_to_rport(job);



	shost = job->rport ? rport_to_shost(job->rport) : fc_bsg_to_shost(job);

	shost = rport ? rport_to_shost(rport) : fc_bsg_to_shost(job);

	adapter = (struct zfcp_adapter *)shost->hostdata[0];



	if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))

drivers/scsi/ibmvscsi/ibmvfc.c

+1 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ static int ibmvfc_bsg_plogi(struct ibmvfc_host *vhost, unsigned int port_id) 
static int ibmvfc_bsg_request(struct fc_bsg_job *job)

{

	struct ibmvfc_host *vhost = shost_priv(fc_bsg_to_shost(job));

	struct fc_rport *rport = job->rport;

	struct fc_rport *rport = fc_bsg_to_rport(job);

	struct ibmvfc_passthru_mad *mad;

	struct ibmvfc_event *evt;

	union ibmvfc_iu rsp_iu;

drivers/scsi/libfc/fc_lport.c

+2 −2
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job) 


	switch (bsg_request->msgcode) {

	case FC_BSG_RPT_ELS:

		rport = job->rport;

		rport = fc_bsg_to_rport(job);

		if (!rport)

			break;
@@ -2113,7 +2113,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job) 
		break;



	case FC_BSG_RPT_CT:

		rport = job->rport;

		rport = fc_bsg_to_rport(job);

		if (!rport)

			break;

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job) 
{

	struct lpfc_vport *vport = shost_priv(fc_bsg_to_shost(job));

	struct lpfc_hba *phba = vport->phba;

	struct lpfc_rport_data *rdata = job->rport->dd_data;

	struct lpfc_rport_data *rdata = fc_bsg_to_rport(job)->dd_data;

	struct lpfc_nodelist *ndlp = rdata->pnode;

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct ulp_bde64 *bpl = NULL;
@@ -660,7 +660,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 
{

	struct lpfc_vport *vport = shost_priv(fc_bsg_to_shost(job));

	struct lpfc_hba *phba = vport->phba;

	struct lpfc_rport_data *rdata = job->rport->dd_data;

	struct lpfc_rport_data *rdata = fc_bsg_to_rport(job)->dd_data;

	struct lpfc_nodelist *ndlp = rdata->pnode;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

drivers/scsi/qla2xxx/qla_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job) 
	uint16_t nextlid = 0;



	if (bsg_request->msgcode == FC_BSG_RPT_ELS) {

		rport = bsg_job->rport;

		rport = fc_bsg_to_rport(bsg_job);

		fcport = *(fc_port_t **) rport->dd_data;

		host = rport_to_shost(rport);

		vha = shost_priv(host);
@@ -2485,7 +2485,7 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job) 
	bsg_reply->reply_payload_rcv_len = 0;



	if (bsg_request->msgcode == FC_BSG_RPT_ELS) {

		rport = bsg_job->rport;

		rport = fc_bsg_to_rport(bsg_job);

		host = rport_to_shost(rport);

		vha = shost_priv(host);

	} else {