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

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

scsi: fc: use bsg_job_done 



fc_bsg_jobdone() and bsg_job_done() are 1:1 copies now so use the
bsg-lib one instead of the FC private implementation.

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 6aa858cd

drivers/s390/scsi/zfcp_fc.c

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static void zfcp_fc_ct_els_job_handler(void *data) 
	jr->reply_payload_rcv_len = job->reply_payload.payload_len;

	jr->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;

	jr->result = zfcp_ct_els->status ? -EIO : 0;

	fc_bsg_jobdone(job, jr->result, jr->reply_payload_rcv_len);

	bsg_job_done(job, jr->result, jr->reply_payload_rcv_len);

}



static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct bsg_job *job)

drivers/scsi/bfa/bfad_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -3179,7 +3179,7 @@ bfad_im_bsg_vendor_request(struct bsg_job *job) 
	bsg_reply->reply_payload_rcv_len = job->reply_payload.payload_len;

	bsg_reply->result = rc;



	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);

	return rc;

error:
@@ -3555,7 +3555,7 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job) 
	bsg_reply->result = rc;



	if (rc == BFA_STATUS_OK)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);



	return rc;

drivers/scsi/ibmvscsi/ibmvfc.c

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job) 
	ibmvfc_free_event(evt);

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

	bsg_reply->result = rc;

	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);

	rc = 0;

out:

drivers/scsi/libfc/fc_lport.c

+2 −2
Original line number Diff line number Diff line
@@ -1912,7 +1912,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, 
		bsg_reply->result = (PTR_ERR(fp) == -FC_EX_CLOSED) ?

			-ECONNABORTED : -ETIMEDOUT;

		job->reply_len = sizeof(uint32_t);

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

		kfree(info);

		return;
@@ -1947,7 +1947,7 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp, 
			bsg_reply->reply_payload_rcv_len =

				job->reply_payload.payload_len;

		bsg_reply->result = 0;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

		kfree(info);

	}

drivers/scsi/lpfc/lpfc_bsg.c

+20 −20
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba, 


	if (job) {

		bsg_reply->result = rc;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}

	return;
@@ -645,7 +645,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba, 


	if (job) {

		bsg_reply->result = rc;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}

	return;
@@ -1138,7 +1138,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
			job->dd_data = NULL;

			/* complete the job back to userspace */

			spin_unlock_irqrestore(&phba->ct_ev_lock, flags);

			fc_bsg_jobdone(job, bsg_reply->result,

			bsg_job_done(job, bsg_reply->result,

				       bsg_reply->reply_payload_rcv_len);

			spin_lock_irqsave(&phba->ct_ev_lock, flags);

		}
@@ -1364,7 +1364,7 @@ lpfc_bsg_hba_get_event(struct bsg_job *job) 
	spin_unlock_irqrestore(&phba->ct_ev_lock, flags);

	job->dd_data = NULL;

	bsg_reply->result = 0;

	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);

	return 0;
@@ -1462,7 +1462,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba, 


	if (job) {

		bsg_reply->result = rc;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}

	return;
@@ -1891,7 +1891,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job) 
	bsg_reply->result = rc;

	/* complete the job back to userspace if no error */

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -2181,7 +2181,7 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct bsg_job *job) 
	bsg_reply->result = rc;

	/* complete the job back to userspace if no error */

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -2296,7 +2296,7 @@ lpfc_sli4_bsg_diag_mode_end(struct bsg_job *job) 
	bsg_reply->result = rc;

	/* complete the job back to userspace if no error */

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -2449,7 +2449,7 @@ lpfc_sli4_bsg_link_diag_test(struct bsg_job *job) 
	bsg_reply->result = rc;

	/* complete the job back to userspace if no error */

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -3310,7 +3310,7 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job) 
	job->dd_data = NULL;

	/* complete the job back to userspace if no error */

	if (rc == IOCB_SUCCESS)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -3354,7 +3354,7 @@ lpfc_bsg_get_dfc_rev(struct bsg_job *job) 
job_error:

	bsg_reply->result = rc;

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}
@@ -3420,7 +3420,7 @@ lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) 


	if (job) {

		bsg_reply->result = 0;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}

	return;
@@ -3669,7 +3669,7 @@ lpfc_bsg_issue_read_mbox_ext_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) 
	/* if the job is still active, call job done */

	if (job) {

		bsg_reply = job->reply;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}

	return;
@@ -3707,7 +3707,7 @@ lpfc_bsg_issue_write_mbox_ext_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) 
	/* if the job is still active, call job done */

	if (job) {

		bsg_reply = job->reply;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}
@@ -4150,7 +4150,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct bsg_job *job, 
	/* wait for additoinal external buffers */



	bsg_reply->result = 0;

	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);

	return SLI_CONFIG_HANDLED;
@@ -4377,7 +4377,7 @@ lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct bsg_job *job) 
	}



	bsg_reply->result = 0;

	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);



	return SLI_CONFIG_HANDLED;
@@ -4494,7 +4494,7 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job, 


	/* wait for additoinal external buffers */

	bsg_reply->result = 0;

	fc_bsg_jobdone(job, bsg_reply->result,

	bsg_job_done(job, bsg_reply->result,

		       bsg_reply->reply_payload_rcv_len);

	return SLI_CONFIG_HANDLED;
@@ -4963,7 +4963,7 @@ lpfc_bsg_mbox_cmd(struct bsg_job *job) 
		/* job done */

		bsg_reply->result = 0;

		job->dd_data = NULL;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	} else if (rc == 1)

		/* job submitted, will complete later*/
@@ -5074,7 +5074,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba, 


	if (job) {

		bsg_reply->result = rc;

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	}
@@ -5293,7 +5293,7 @@ lpfc_forced_link_speed(struct bsg_job *job) 
job_error:

	bsg_reply->result = rc;

	if (rc == 0)

		fc_bsg_jobdone(job, bsg_reply->result,

		bsg_job_done(job, bsg_reply->result,

			       bsg_reply->reply_payload_rcv_len);

	return rc;

}