Commit 54343d95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two last minute fixes, both in drivers.

  The fnic one is a highly unlikely condition, but the RDMA one is a
  recently introduced regression that causes a kernel warning to trigger
  in every RDMA logon, which would be unsightly if it got into the final
  release"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: RDMA/isert: Fix a recently introduced regression related to logout
  scsi: fnic: do not queue commands during fwreset
parents b1b29891 04060db4

drivers/infiniband/ulp/isert/ib_isert.c

+0 −12
Original line number Diff line number Diff line
@@ -2575,17 +2575,6 @@ isert_wait4logout(struct isert_conn *isert_conn) 
	}

}



static void

isert_wait4cmds(struct iscsi_conn *conn)

{

	isert_info("iscsi_conn %p\n", conn);



	if (conn->sess) {

		target_sess_cmd_list_set_waiting(conn->sess->se_sess);

		target_wait_for_sess_cmds(conn->sess->se_sess);

	}

}



/**

 * isert_put_unsol_pending_cmds() - Drop commands waiting for

 *     unsolicitate dataout
@@ -2633,7 +2622,6 @@ static void isert_wait_conn(struct iscsi_conn *conn) 


	ib_drain_qp(isert_conn->qp);

	isert_put_unsol_pending_cmds(conn);

	isert_wait4cmds(conn);

	isert_wait4logout(isert_conn);



	queue_work(isert_release_wq, &isert_conn->release_work);

drivers/scsi/fnic/fnic_scsi.c

+3 −0
Original line number Diff line number Diff line
@@ -439,6 +439,9 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_ 
	if (unlikely(fnic_chk_state_flags_locked(fnic, FNIC_FLAGS_IO_BLOCKED)))

		return SCSI_MLQUEUE_HOST_BUSY;



	if (unlikely(fnic_chk_state_flags_locked(fnic, FNIC_FLAGS_FWRESET)))

		return SCSI_MLQUEUE_HOST_BUSY;



	rport = starget_to_rport(scsi_target(sc->device));

	if (!rport) {

		FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,

drivers/target/iscsi/iscsi_target.c

+3 −3
Original line number Diff line number Diff line
@@ -4149,9 +4149,6 @@ int iscsit_close_connection( 
	iscsit_stop_nopin_response_timer(conn);

	iscsit_stop_nopin_timer(conn);



	if (conn->conn_transport->iscsit_wait_conn)

		conn->conn_transport->iscsit_wait_conn(conn);



	/*

	 * During Connection recovery drop unacknowledged out of order

	 * commands for this connection, and prepare the other commands
@@ -4237,6 +4234,9 @@ int iscsit_close_connection( 
	target_sess_cmd_list_set_waiting(sess->se_sess);

	target_wait_for_sess_cmds(sess->se_sess);



	if (conn->conn_transport->iscsit_wait_conn)

		conn->conn_transport->iscsit_wait_conn(conn);



	ahash_request_free(conn->conn_tx_hash);

	if (conn->conn_rx_hash) {

		struct crypto_ahash *tfm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE