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

Commit fa79dbdb authored by Hillf Danton's avatar Hillf Danton Committed by James Bottomley
Browse files

[SCSI] libfc: Return a valid return code in fc_fcp_pkt_abort() 



Here ticks_left is added to record the result of
wait_for_completion_timeout().

[ Patch title and description edited by Robert Love
  to make it more descriptive  ]

Signed-off-by: default avatarHillf Danton <dhillf@gmail.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f56635a8

drivers/scsi/libfc/fc_fcp.c

+4 −3
Original line number Diff line number Diff line
@@ -1202,6 +1202,7 @@ static void fc_fcp_error(struct fc_fcp_pkt *fsp, struct fc_frame *fp) 
static int fc_fcp_pkt_abort(struct fc_fcp_pkt *fsp)

{

	int rc = FAILED;

	unsigned long ticks_left;



	if (fc_fcp_send_abort(fsp))

		return FAILED;
@@ -1210,13 +1211,13 @@ static int fc_fcp_pkt_abort(struct fc_fcp_pkt *fsp) 
	fsp->wait_for_comp = 1;



	spin_unlock_bh(&fsp->scsi_pkt_lock);

	rc = wait_for_completion_timeout(&fsp->tm_done, FC_SCSI_TM_TOV);

	ticks_left = wait_for_completion_timeout(&fsp->tm_done,

							FC_SCSI_TM_TOV);

	spin_lock_bh(&fsp->scsi_pkt_lock);

	fsp->wait_for_comp = 0;



	if (!rc) {

	if (!ticks_left) {

		FC_FCP_DBG(fsp, "target abort cmd  failed\n");

		rc = FAILED;

	} else if (fsp->state & FC_SRB_ABORTED) {

		FC_FCP_DBG(fsp, "target abort cmd  passed\n");

		rc = SUCCESS;