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

Commit 01e0e15c authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: don't use fc_bsg_job::request and fc_bsg_job::reply directly 



Don't use fc_bsg_job::request and fc_bsg_job::reply directly, but use
helper variables bsg_request and bsg_reply. This will be helpful when
transitioning to bsg-lib.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent eb340948

drivers/s390/scsi/zfcp_fc.c

+6 −3
Original line number Diff line number Diff line
@@ -900,8 +900,9 @@ static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job) 
	u32 preamble_word1;

	u8 gs_type;

	struct zfcp_adapter *adapter;

	struct fc_bsg_request *bsg_request = job->request;



	preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;

	preamble_word1 = bsg_request->rqst_data.r_ct.preamble_word1;

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



	adapter = (struct zfcp_adapter *) job->shost->hostdata[0];
@@ -938,6 +939,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job, 
{

	struct zfcp_fsf_ct_els *els = job->dd_data;

	struct fc_rport *rport = job->rport;

	struct fc_bsg_request *bsg_request = job->request;

	struct zfcp_port *port;

	u32 d_id;
@@ -949,7 +951,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job, 
		d_id = port->d_id;

		put_device(&port->dev);

	} else

		d_id = ntoh24(job->request->rqst_data.h_els.port_id);

		d_id = ntoh24(bsg_request->rqst_data.h_els.port_id);



	els->handler = zfcp_fc_ct_els_job_handler;

	return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ);
@@ -983,6 +985,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) 
	struct Scsi_Host *shost;

	struct zfcp_adapter *adapter;

	struct zfcp_fsf_ct_els *ct_els = job->dd_data;

	struct fc_bsg_request *bsg_request = job->request;



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

	adapter = (struct zfcp_adapter *)shost->hostdata[0];
@@ -994,7 +997,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) 
	ct_els->resp = job->reply_payload.sg_list;

	ct_els->handler_data = job;



	switch (job->request->msgcode) {

	switch (bsg_request->msgcode) {

	case FC_BSG_RPT_ELS:

	case FC_BSG_HST_ELS_NOLOGIN:

		return zfcp_fc_exec_els_job(job, adapter);

drivers/scsi/bfa/bfad_bsg.c

+23 −17
Original line number Diff line number Diff line
@@ -3132,7 +3132,9 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd, 
static int

bfad_im_bsg_vendor_request(struct fc_bsg_job *job)

{

	uint32_t vendor_cmd = job->request->rqst_data.h_vendor.vendor_cmd[0];

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	uint32_t vendor_cmd = bsg_request->rqst_data.h_vendor.vendor_cmd[0];

	struct bfad_im_port_s *im_port =

			(struct bfad_im_port_s *) job->shost->hostdata[0];

	struct bfad_s *bfad = im_port->bfad;
@@ -3175,8 +3177,8 @@ bfad_im_bsg_vendor_request(struct fc_bsg_job *job) 


	/* Fill the BSG job reply data */

	job->reply_len = job->reply_payload.payload_len;

	job->reply->reply_payload_rcv_len = job->reply_payload.payload_len;

	job->reply->result = rc;

	bsg_reply->reply_payload_rcv_len = job->reply_payload.payload_len;

	bsg_reply->result = rc;



	job->job_done(job);

	return rc;
@@ -3184,9 +3186,9 @@ bfad_im_bsg_vendor_request(struct fc_bsg_job *job) 
	/* free the command buffer */

	kfree(payload_kbuf);

out:

	job->reply->result = rc;

	bsg_reply->result = rc;

	job->reply_len = sizeof(uint32_t);

	job->reply->reply_payload_rcv_len = 0;

	bsg_reply->reply_payload_rcv_len = 0;

	return rc;

}
@@ -3362,17 +3364,19 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) 
	struct bfad_fcxp    *drv_fcxp;

	struct bfa_fcs_lport_s *fcs_port;

	struct bfa_fcs_rport_s *fcs_rport;

	uint32_t command_type = job->request->msgcode;

	struct fc_bsg_request *bsg_request = bsg_request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	uint32_t command_type = bsg_request->msgcode;

	unsigned long flags;

	struct bfad_buf_info *rsp_buf_info;

	void *req_kbuf = NULL, *rsp_kbuf = NULL;

	int rc = -EINVAL;



	job->reply_len  = sizeof(uint32_t);	/* Atleast uint32_t reply_len */

	job->reply->reply_payload_rcv_len = 0;

	bsg_reply->reply_payload_rcv_len = 0;



	/* Get the payload passed in from userspace */

	bsg_data = (struct bfa_bsg_data *) (((char *)job->request) +

	bsg_data = (struct bfa_bsg_data *) (((char *)bsg_request) +

					    sizeof(struct fc_bsg_request));

	if (bsg_data == NULL)

		goto out;
@@ -3517,13 +3521,13 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) 
	/* fill the job->reply data */

	if (drv_fcxp->req_status == BFA_STATUS_OK) {

		job->reply_len = drv_fcxp->rsp_len;

		job->reply->reply_payload_rcv_len = drv_fcxp->rsp_len;

		job->reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;

		bsg_reply->reply_payload_rcv_len = drv_fcxp->rsp_len;

		bsg_reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;

	} else {

		job->reply->reply_payload_rcv_len =

		bsg_reply->reply_payload_rcv_len =

					sizeof(struct fc_bsg_ctels_reply);

		job->reply_len = sizeof(uint32_t);

		job->reply->reply_data.ctels_reply.status =

		bsg_reply->reply_data.ctels_reply.status =

						FC_CTELS_STATUS_REJECT;

	}
@@ -3549,7 +3553,7 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) 
	kfree(bsg_fcpt);

	kfree(drv_fcxp);

out:

	job->reply->result = rc;

	bsg_reply->result = rc;



	if (rc == BFA_STATUS_OK)

		job->job_done(job);
@@ -3560,9 +3564,11 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job) 
int

bfad_im_bsg_request(struct fc_bsg_job *job)

{

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	uint32_t rc = BFA_STATUS_OK;



	switch (job->request->msgcode) {

	switch (bsg_request->msgcode) {

	case FC_BSG_HST_VENDOR:

		/* Process BSG HST Vendor requests */

		rc = bfad_im_bsg_vendor_request(job);
@@ -3575,8 +3581,8 @@ bfad_im_bsg_request(struct fc_bsg_job *job) 
		rc = bfad_im_bsg_els_ct_request(job);

		break;

	default:

		job->reply->result = rc = -EINVAL;

		job->reply->reply_payload_rcv_len = 0;

		bsg_reply->result = rc = -EINVAL;

		bsg_reply->reply_payload_rcv_len = 0;

		break;

	}

drivers/scsi/ibmvscsi/ibmvfc.c

+12 −10
Original line number Diff line number Diff line
@@ -1827,28 +1827,30 @@ static int ibmvfc_bsg_request(struct fc_bsg_job *job) 
	struct ibmvfc_event *evt;

	union ibmvfc_iu rsp_iu;

	unsigned long flags, port_id = -1;

	unsigned int code = job->request->msgcode;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	unsigned int code = bsg_request->msgcode;

	int rc = 0, req_seg, rsp_seg, issue_login = 0;

	u32 fc_flags, rsp_len;



	ENTER;

	job->reply->reply_payload_rcv_len = 0;

	bsg_reply->reply_payload_rcv_len = 0;

	if (rport)

		port_id = rport->port_id;



	switch (code) {

	case FC_BSG_HST_ELS_NOLOGIN:

		port_id = (job->request->rqst_data.h_els.port_id[0] << 16) |

			(job->request->rqst_data.h_els.port_id[1] << 8) |

			job->request->rqst_data.h_els.port_id[2];

		port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) |

			(bsg_request->rqst_data.h_els.port_id[1] << 8) |

			bsg_request->rqst_data.h_els.port_id[2];

	case FC_BSG_RPT_ELS:

		fc_flags = IBMVFC_FC_ELS;

		break;

	case FC_BSG_HST_CT:

		issue_login = 1;

		port_id = (job->request->rqst_data.h_ct.port_id[0] << 16) |

			(job->request->rqst_data.h_ct.port_id[1] << 8) |

			job->request->rqst_data.h_ct.port_id[2];

		port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) |

			(bsg_request->rqst_data.h_ct.port_id[1] << 8) |

			bsg_request->rqst_data.h_ct.port_id[2];

	case FC_BSG_RPT_CT:

		fc_flags = IBMVFC_FC_CT_IU;

		break;
@@ -1937,12 +1939,12 @@ static int ibmvfc_bsg_request(struct fc_bsg_job *job) 
	if (rsp_iu.passthru.common.status)

		rc = -EIO;

	else

		job->reply->reply_payload_rcv_len = rsp_len;

		bsg_reply->reply_payload_rcv_len = rsp_len;



	spin_lock_irqsave(vhost->host->host_lock, flags);

	ibmvfc_free_event(evt);

	spin_unlock_irqrestore(vhost->host->host_lock, flags);

	job->reply->result = rc;

	bsg_reply->result = rc;

	job->job_done(job);

	rc = 0;

out:

drivers/scsi/libfc/fc_lport.c

+13 −10
Original line number Diff line number Diff line
@@ -1902,13 +1902,14 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, 
{

	struct fc_bsg_info *info = info_arg;

	struct fc_bsg_job *job = info->job;

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct fc_lport *lport = info->lport;

	struct fc_frame_header *fh;

	size_t len;

	void *buf;



	if (IS_ERR(fp)) {

		job->reply->result = (PTR_ERR(fp) == -FC_EX_CLOSED) ?

		bsg_reply->result = (PTR_ERR(fp) == -FC_EX_CLOSED) ?

			-ECONNABORTED : -ETIMEDOUT;

		job->reply_len = sizeof(uint32_t);

		job->state_flags |= FC_RQST_STATE_DONE;
@@ -1929,23 +1930,23 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, 
			(unsigned short)fc_frame_payload_op(fp);



		/* Save the reply status of the job */

		job->reply->reply_data.ctels_reply.status =

		bsg_reply->reply_data.ctels_reply.status =

			(cmd == info->rsp_code) ?

			FC_CTELS_STATUS_OK : FC_CTELS_STATUS_REJECT;

	}



	job->reply->reply_payload_rcv_len +=

	bsg_reply->reply_payload_rcv_len +=

		fc_copy_buffer_to_sglist(buf, len, info->sg, &info->nents,

					 &info->offset, NULL);



	if (fr_eof(fp) == FC_EOF_T &&

	    (ntoh24(fh->fh_f_ctl) & (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) ==

	    (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) {

		if (job->reply->reply_payload_rcv_len >

		if (bsg_reply->reply_payload_rcv_len >

		    job->reply_payload.payload_len)

			job->reply->reply_payload_rcv_len =

			bsg_reply->reply_payload_rcv_len =

				job->reply_payload.payload_len;

		job->reply->result = 0;

		bsg_reply->result = 0;

		job->state_flags |= FC_RQST_STATE_DONE;

		job->job_done(job);

		kfree(info);
@@ -2082,6 +2083,8 @@ static int fc_lport_ct_request(struct fc_bsg_job *job, 
 */

int fc_lport_bsg_request(struct fc_bsg_job *job)

{

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct request *rsp = job->req->next_rq;

	struct Scsi_Host *shost = job->shost;

	struct fc_lport *lport = shost_priv(shost);
@@ -2090,13 +2093,13 @@ int fc_lport_bsg_request(struct fc_bsg_job *job) 
	int rc = -EINVAL;

	u32 did, tov;



	job->reply->reply_payload_rcv_len = 0;

	bsg_reply->reply_payload_rcv_len = 0;

	if (rsp)

		rsp->resid_len = job->reply_payload.payload_len;



	mutex_lock(&lport->lp_mutex);



	switch (job->request->msgcode) {

	switch (bsg_request->msgcode) {

	case FC_BSG_RPT_ELS:

		rport = job->rport;

		if (!rport)
@@ -2118,7 +2121,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job) 
		break;



	case FC_BSG_HST_CT:

		did = ntoh24(job->request->rqst_data.h_ct.port_id);

		did = ntoh24(bsg_request->rqst_data.h_ct.port_id);

		if (did == FC_FID_DIR_SERV) {

			rdata = lport->dns_rdata;

			if (!rdata)
@@ -2136,7 +2139,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job) 
		break;



	case FC_BSG_HST_ELS_NOLOGIN:

		did = ntoh24(job->request->rqst_data.h_els.port_id);

		did = ntoh24(bsg_request->rqst_data.h_els.port_id);

		rc = fc_lport_els_request(job, lport, did, lport->e_d_tov);

		break;

	}