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

Commit 92886c9c authored by Bhanu Prakash Gollapudi's avatar Bhanu Prakash Gollapudi Committed by James Bottomley
Browse files

[SCSI] bnx2fc: cleanup task management IO when it times out. 



When the task management IO times out, or a flush operation is performed while
task management IO is pending, driver is not cleaning up the IO. This patch
cleans up the IO for the above cases.

Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c1bb4f33

drivers/scsi/bnx2fc/bnx2fc_io.c

+15 −1
Original line number Diff line number Diff line
@@ -810,8 +810,22 @@ static int bnx2fc_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) 
	spin_lock_bh(&tgt->tgt_lock);



	io_req->wait_for_comp = 0;

	if (!(test_bit(BNX2FC_FLAG_TM_COMPL, &io_req->req_flags)))

	if (!(test_bit(BNX2FC_FLAG_TM_COMPL, &io_req->req_flags))) {

		set_bit(BNX2FC_FLAG_TM_TIMEOUT, &io_req->req_flags);

		if (io_req->on_tmf_queue) {

			list_del_init(&io_req->link);

			io_req->on_tmf_queue = 0;

		}

		io_req->wait_for_comp = 1;

		bnx2fc_initiate_cleanup(io_req);

		spin_unlock_bh(&tgt->tgt_lock);

		rc = wait_for_completion_timeout(&io_req->tm_done,

						 BNX2FC_FW_TIMEOUT);

		spin_lock_bh(&tgt->tgt_lock);

		io_req->wait_for_comp = 0;

		if (!rc)

			kref_put(&io_req->refcount, bnx2fc_cmd_release);

	}



	spin_unlock_bh(&tgt->tgt_lock);

drivers/scsi/bnx2fc/bnx2fc_tgt.c

+10 −0
Original line number Diff line number Diff line
@@ -185,6 +185,16 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt) 
		BUG_ON(rc);

	}



	list_for_each_safe(list, tmp, &tgt->active_tm_queue) {

		i++;

		io_req = (struct bnx2fc_cmd *)list;

		list_del_init(&io_req->link);

		io_req->on_tmf_queue = 0;

		BNX2FC_IO_DBG(io_req, "tm_queue cleanup\n");

		if (io_req->wait_for_comp)

			complete(&io_req->tm_done);

	}



	list_for_each_safe(list, tmp, &tgt->els_queue) {

		i++;

		io_req = (struct bnx2fc_cmd *)list;