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

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

scsi: fc: provide fc_bsg_to_shost() helper 



Provide fc_bsg_to_shost() helper that will become handy when we're
moving from struct fc_bsg_job to a plain struct bsg_job. Also use this
little helper in the LLDDs.

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 1abaede7

drivers/s390/scsi/zfcp_fc.c

+4 −2
Original line number Diff line number Diff line
@@ -901,11 +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 Scsi_Host *shost;



	preamble_word1 = bsg_request->rqst_data.r_ct.preamble_word1;

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



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

	shost = fc_bsg_to_shost(job);

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



	switch (gs_type) {

	case FC_FST_ALIAS:
@@ -987,7 +989,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job) 
	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;

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

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



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

drivers/scsi/bfa/bfad_bsg.c

+2 −4
Original line number Diff line number Diff line
@@ -3135,8 +3135,7 @@ bfad_im_bsg_vendor_request(struct fc_bsg_job *job) 
	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_im_port_s *im_port = shost_priv(fc_bsg_to_shost(job));

	struct bfad_s *bfad = im_port->bfad;

	struct request_queue *request_q = job->req->q;

	void *payload_kbuf;
@@ -3358,8 +3357,7 @@ int 
bfad_im_bsg_els_ct_request(struct fc_bsg_job *job)

{

	struct bfa_bsg_data *bsg_data;

	struct bfad_im_port_s *im_port =

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

	struct bfad_im_port_s *im_port = shost_priv(fc_bsg_to_shost(job));

	struct bfad_s *bfad = im_port->bfad;

	bfa_bsg_fcpt_t *bsg_fcpt;

	struct bfad_fcxp    *drv_fcxp;

drivers/scsi/ibmvscsi/ibmvfc.c

+2 −2
Original line number Diff line number Diff line
@@ -1708,7 +1708,7 @@ static void ibmvfc_bsg_timeout_done(struct ibmvfc_event *evt) 
 **/

static int ibmvfc_bsg_timeout(struct fc_bsg_job *job)

{

	struct ibmvfc_host *vhost = shost_priv(job->shost);

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

	unsigned long port_id = (unsigned long)job->dd_data;

	struct ibmvfc_event *evt;

	struct ibmvfc_tmf *tmf;
@@ -1821,7 +1821,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(job->shost);

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

	struct fc_rport *rport = job->rport;

	struct ibmvfc_passthru_mad *mad;

	struct ibmvfc_event *evt;

drivers/scsi/libfc/fc_lport.c

+1 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ 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 Scsi_Host *shost = fc_bsg_to_shost(job);

	struct fc_lport *lport = shost_priv(shost);

	struct fc_rport *rport;

	struct fc_rport_priv *rdata;

drivers/scsi/lpfc/lpfc_bsg.c

+17 −17
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba, 
static int

lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

	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_nodelist *ndlp = rdata->pnode;
@@ -658,7 +658,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba, 
static int

lpfc_bsg_rport_els(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

	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_nodelist *ndlp = rdata->pnode;
@@ -1202,7 +1202,7 @@ lpfc_bsg_ct_unsol_abort(struct lpfc_hba *phba, struct hbq_dmabuf *dmabuf) 
static int

lpfc_bsg_hba_set_event(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct lpfc_hba *phba = vport->phba;

	struct fc_bsg_request *bsg_request = job->request;

	struct set_ct_event *event_req;
@@ -1287,7 +1287,7 @@ lpfc_bsg_hba_set_event(struct fc_bsg_job *job) 
static int

lpfc_bsg_hba_get_event(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct lpfc_hba *phba = vport->phba;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;
@@ -1625,7 +1625,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 
static int

lpfc_bsg_send_mgmt_rsp(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct lpfc_hba *phba = vport->phba;

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;
@@ -2201,10 +2201,10 @@ lpfc_bsg_diag_loopback_mode(struct fc_bsg_job *job) 
	struct lpfc_hba *phba;

	int rc;



	shost = job->shost;

	shost = fc_bsg_to_shost(job);

	if (!shost)

		return -ENODEV;

	vport = (struct lpfc_vport *)job->shost->hostdata;

	vport = shost_priv(shost);

	if (!vport)

		return -ENODEV;

	phba = vport->phba;
@@ -2241,10 +2241,10 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job) 
	uint32_t timeout;

	int rc, i;



	shost = job->shost;

	shost = fc_bsg_to_shost(job);

	if (!shost)

		return -ENODEV;

	vport = (struct lpfc_vport *)job->shost->hostdata;

	vport = shost_priv(shost);

	if (!vport)

		return -ENODEV;

	phba = vport->phba;
@@ -2325,12 +2325,12 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job) 
	struct diag_status *diag_status_reply;

	int mbxstatus, rc = 0;



	shost = job->shost;

	shost = fc_bsg_to_shost(job);

	if (!shost) {

		rc = -ENODEV;

		goto job_error;

	}

	vport = (struct lpfc_vport *)job->shost->hostdata;

	vport = shost_priv(shost);

	if (!vport) {

		rc = -ENODEV;

		goto job_error;
@@ -3018,7 +3018,7 @@ static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri, 
static int

lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct lpfc_hba *phba = vport->phba;

	struct lpfc_bsg_event *evt;
@@ -3322,7 +3322,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job) 
static int

lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct lpfc_hba *phba = vport->phba;

	struct get_mgmt_rev_reply *event_reply;
@@ -4933,7 +4933,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, 
static int

lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct lpfc_hba *phba = vport->phba;
@@ -5093,7 +5093,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba, 
static int

lpfc_menlo_cmd(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct fc_bsg_request *bsg_request = job->request;

	struct fc_bsg_reply *bsg_reply = job->reply;

	struct lpfc_hba *phba = vport->phba;
@@ -5257,7 +5257,7 @@ lpfc_menlo_cmd(struct fc_bsg_job *job) 
static int

lpfc_forced_link_speed(struct fc_bsg_job *job)

{

	struct Scsi_Host *shost = job->shost;

	struct Scsi_Host *shost = fc_bsg_to_shost(job);

	struct lpfc_vport *vport = shost_priv(shost);

	struct lpfc_hba *phba = vport->phba;

	struct fc_bsg_reply *bsg_reply = job->reply;
@@ -5400,7 +5400,7 @@ lpfc_bsg_request(struct fc_bsg_job *job) 
int

lpfc_bsg_timeout(struct fc_bsg_job *job)

{

	struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;

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

	struct lpfc_hba *phba = vport->phba;

	struct lpfc_iocbq *cmdiocb;

	struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];