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

Commit 5bd665f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull target updates from Nicholas Bellinger:
 "It has been a very busy development cycle this time around in target
  land, with the highlights including:

   - Kill struct se_subsystem_dev, in favor of direct se_device usage
     (hch)
   - Simplify reservations code by combining SPC-3 + SCSI-2 support for
     virtual backends only (hch)
   - Simplify ALUA code for virtual only backends, and remove left over
     abstractions (hch)
   - Pass sense_reason_t as return value for I/O submission path (hch)
   - Refactor MODE_SENSE emulation to allow for easier addition of new
     mode pages.  (roland)
   - Add emulation of MODE_SELECT (roland)
   - Fix bug in handling of ExpStatSN wrap-around (steve)
   - Fix bug in TMR ABORT_TASK lookup in qla2xxx target (steve)
   - Add WRITE_SAME w/ UNMAP=0 support for IBLOCK backends (nab)
   - Convert ib_srpt to use modern target_submit_cmd caller + drop
     legacy ioctx->kref usage (nab)
   - Convert ib_srpt to use modern target_submit_tmr caller (nab)
   - Add link_magic for fabric allow_link destination target_items for
     symlinks within target_core_fabric_configfs.c code (nab)
   - Allocate pointers in instead of full structs for
     config_group->default_groups (sebastian)
   - Fix 32-bit highmem breakage for FILEIO (sebastian)

  All told, hch was able to shave off another ~1K LOC by killing the
  se_subsystem_dev abstraction, along with a number of PR + ALUA
  simplifications.  Also, a nice patch by Roland is the refactoring of
  MODE_SENSE handling, along with the addition of initial MODE_SELECT
  emulation support for virtual backends.

  Sebastian found a long-standing issue wrt to allocation of full
  config_group instead of pointers for config_group->default_group[]
  setup in a number of areas, which ends up saving memory with big
  configurations.  He also managed to fix another long-standing BUG wrt
  to broken 32-bit highmem support within the FILEIO backend driver.

  Thank you again to everyone who contributed this round!"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (50 commits)
  target/iscsi_target: Add NodeACL tags for initiator group support
  target/tcm_fc: fix the lockdep warning due to inconsistent lock state
  sbp-target: fix error path in sbp_make_tpg()
  sbp-target: use simple assignment in tgt_agent_rw_agent_state()
  iscsi-target: use kstrdup() for iscsi_param
  target/file: merge fd_do_readv() and fd_do_writev()
  target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
  target: Add link_magic for fabric allow_link destination target_items
  ib_srpt: Convert TMR path to target_submit_tmr
  ib_srpt: Convert I/O path to target_submit_cmd + drop legacy ioctx->kref
  target: Make spc_get_write_same_sectors return sector_t
  target/configfs: use kmalloc() instead of kzalloc() for default groups
  target/configfs: allocate only 6 slots for dev_cg->default_groups
  target/configfs: allocate pointers instead of full struct for default_groups
  target: update error handling for sbc_setup_write_same()
  iscsit: use GFP_ATOMIC under spin lock
  iscsi_target: Remove redundant null check before kfree
  target/iblock: Forward declare bio helpers
  target: Clean up flow in transport_check_aborted_status()
  target: Clean up logic in transport_put_cmd()
  ...
parents 115b1cc2 79e62fc3

drivers/infiniband/ulp/srpt/ib_srpt.c

+76 −102
Original line number Diff line number Diff line
@@ -1269,7 +1269,6 @@ static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch) 
		return ioctx;



	BUG_ON(ioctx->ch != ch);

	kref_init(&ioctx->kref);

	spin_lock_init(&ioctx->spinlock);

	ioctx->state = SRPT_STATE_NEW;

	ioctx->n_rbuf = 0;
@@ -1290,39 +1289,6 @@ static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch) 
	return ioctx;

}



/**

 * srpt_put_send_ioctx() - Free up resources.

 */

static void srpt_put_send_ioctx(struct srpt_send_ioctx *ioctx)

{

	struct srpt_rdma_ch *ch;

	unsigned long flags;



	BUG_ON(!ioctx);

	ch = ioctx->ch;

	BUG_ON(!ch);



	WARN_ON(srpt_get_cmd_state(ioctx) != SRPT_STATE_DONE);



	srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);

	transport_generic_free_cmd(&ioctx->cmd, 0);



	if (ioctx->n_rbuf > 1) {

		kfree(ioctx->rbufs);

		ioctx->rbufs = NULL;

		ioctx->n_rbuf = 0;

	}



	spin_lock_irqsave(&ch->spinlock, flags);

	list_add(&ioctx->free_list, &ch->free_list);

	spin_unlock_irqrestore(&ch->spinlock, flags);

}



static void srpt_put_send_ioctx_kref(struct kref *kref)

{

	srpt_put_send_ioctx(container_of(kref, struct srpt_send_ioctx, kref));

}



/**

 * srpt_abort_cmd() - Abort a SCSI command.

 * @ioctx:   I/O context associated with the SCSI command.
@@ -1359,8 +1325,14 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
	}

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	if (state == SRPT_STATE_DONE)

	if (state == SRPT_STATE_DONE) {

		struct srpt_rdma_ch *ch = ioctx->ch;



		BUG_ON(ch->sess == NULL);



		target_put_sess_cmd(ch->sess, &ioctx->cmd);

		goto out;

	}



	pr_debug("Aborting cmd with state %d and tag %lld\n", state,

		 ioctx->tag);
@@ -1395,11 +1367,11 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
		spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);

		ioctx->cmd.transport_state |= CMD_T_LUN_STOP;

		spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);

		kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		break;

	case SRPT_STATE_MGMT_RSP_SENT:

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		break;

	default:

		WARN_ON("ERROR: unexpected command state");
@@ -1457,12 +1429,14 @@ static void srpt_handle_send_comp(struct srpt_rdma_ch *ch, 
		    && state != SRPT_STATE_DONE))

		pr_debug("state = %d\n", state);



	if (state != SRPT_STATE_DONE)

		kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);

	else

	if (state != SRPT_STATE_DONE) {

		srpt_unmap_sg_to_ib_sge(ch, ioctx);

		transport_generic_free_cmd(&ioctx->cmd, 0);

	} else {

		printk(KERN_ERR "IB completion has been received too late for"

		       " wr_id = %u.\n", ioctx->ioctx.index);

	}

}



/**

 * srpt_handle_rdma_comp() - Process an IB RDMA completion notification.
@@ -1712,10 +1686,10 @@ static uint64_t srpt_unpack_lun(const uint8_t *lun, int len) 


static int srpt_check_stop_free(struct se_cmd *cmd)

{

	struct srpt_send_ioctx *ioctx;

	struct srpt_send_ioctx *ioctx = container_of(cmd,

				struct srpt_send_ioctx, cmd);



	ioctx = container_of(cmd, struct srpt_send_ioctx, cmd);

	return kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);

	return target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

}



/**
@@ -1730,12 +1704,12 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, 
	uint64_t unpacked_lun;

	u64 data_len;

	enum dma_data_direction dir;

	int ret;

	sense_reason_t ret;

	int rc;



	BUG_ON(!send_ioctx);



	srp_cmd = recv_ioctx->ioctx.buf;

	kref_get(&send_ioctx->kref);

	cmd = &send_ioctx->cmd;

	send_ioctx->tag = srp_cmd->tag;
@@ -1755,40 +1729,26 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, 
		break;

	}



	ret = srpt_get_desc_tbl(send_ioctx, srp_cmd, &dir, &data_len);

	if (ret) {

	if (srpt_get_desc_tbl(send_ioctx, srp_cmd, &dir, &data_len)) {

		printk(KERN_ERR "0x%llx: parsing SRP descriptor table failed.\n",

		       srp_cmd->tag);

		cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;

		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);

		ret = TCM_INVALID_CDB_FIELD;

		goto send_sense;

	}



	cmd->data_length = data_len;

	cmd->data_direction = dir;

	unpacked_lun = srpt_unpack_lun((uint8_t *)&srp_cmd->lun,

				       sizeof(srp_cmd->lun));

	if (transport_lookup_cmd_lun(cmd, unpacked_lun) < 0) {

		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);

		goto send_sense;

	}

	ret = target_setup_cmd_from_cdb(cmd, srp_cmd->cdb);

	if (ret < 0) {

		kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);

		if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {

			srpt_queue_status(cmd);

			return 0;

		} else

	rc = target_submit_cmd(cmd, ch->sess, srp_cmd->cdb,

			&send_ioctx->sense_data[0], unpacked_lun, data_len,

			MSG_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);

	if (rc != 0) {

		ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;

		goto send_sense;

	}



	transport_handle_cdb_direct(cmd);

	return 0;



send_sense:

	transport_send_check_condition_and_sense(cmd, cmd->scsi_sense_reason,

						 0);

	transport_send_check_condition_and_sense(cmd, ret, 0);

	return -1;

}
@@ -1865,9 +1825,11 @@ static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch, 
{

	struct srp_tsk_mgmt *srp_tsk;

	struct se_cmd *cmd;

	struct se_session *sess = ch->sess;

	uint64_t unpacked_lun;

	uint32_t tag = 0;

	int tcm_tmr;

	int res;

	int rc;



	BUG_ON(!send_ioctx);
@@ -1882,39 +1844,32 @@ static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch, 
	send_ioctx->tag = srp_tsk->tag;

	tcm_tmr = srp_tmr_to_tcm(srp_tsk->tsk_mgmt_func);

	if (tcm_tmr < 0) {

		send_ioctx->cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		send_ioctx->cmd.se_tmr_req->response =

			TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;

		goto process_tmr;

	}

	res = core_tmr_alloc_req(cmd, NULL, tcm_tmr, GFP_KERNEL);

	if (res < 0) {

		send_ioctx->cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		send_ioctx->cmd.se_tmr_req->response = TMR_FUNCTION_REJECTED;

		goto process_tmr;

		goto fail;

	}



	unpacked_lun = srpt_unpack_lun((uint8_t *)&srp_tsk->lun,

				       sizeof(srp_tsk->lun));

	res = transport_lookup_tmr_lun(&send_ioctx->cmd, unpacked_lun);

	if (res) {

		pr_debug("rejecting TMR for LUN %lld\n", unpacked_lun);

		send_ioctx->cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		send_ioctx->cmd.se_tmr_req->response = TMR_LUN_DOES_NOT_EXIST;

		goto process_tmr;

	}



	if (srp_tsk->tsk_mgmt_func == SRP_TSK_ABORT_TASK)

		srpt_rx_mgmt_fn_tag(send_ioctx, srp_tsk->task_tag);



process_tmr:

	kref_get(&send_ioctx->kref);

	if (!(send_ioctx->cmd.se_cmd_flags & SCF_SCSI_CDB_EXCEPTION))

		transport_generic_handle_tmr(&send_ioctx->cmd);

	else

		transport_send_check_condition_and_sense(cmd,

						cmd->scsi_sense_reason, 0);



	if (srp_tsk->tsk_mgmt_func == SRP_TSK_ABORT_TASK) {

		rc = srpt_rx_mgmt_fn_tag(send_ioctx, srp_tsk->task_tag);

		if (rc < 0) {

			send_ioctx->cmd.se_tmr_req->response =

					TMR_TASK_DOES_NOT_EXIST;

			goto fail;

		}

		tag = srp_tsk->task_tag;

	}

	rc = target_submit_tmr(&send_ioctx->cmd, sess, NULL, unpacked_lun,

				srp_tsk, tcm_tmr, GFP_KERNEL, tag,

				TARGET_SCF_ACK_KREF);

	if (rc != 0) {

		send_ioctx->cmd.se_tmr_req->response = TMR_FUNCTION_REJECTED;

		goto fail;

	}

	return;

fail:

	transport_send_check_condition_and_sense(cmd, 0, 0); // XXX:

}



/**
@@ -1956,10 +1911,6 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch, 
		}

	}



	transport_init_se_cmd(&send_ioctx->cmd, &srpt_target->tf_ops, ch->sess,

			      0, DMA_NONE, MSG_SIMPLE_TAG,

			      send_ioctx->sense_data);



	switch (srp_cmd->opcode) {

	case SRP_CMD:

		srpt_handle_cmd(ch, recv_ioctx, send_ioctx);
@@ -2365,6 +2316,7 @@ static void srpt_release_channel_work(struct work_struct *w) 
{

	struct srpt_rdma_ch *ch;

	struct srpt_device *sdev;

	struct se_session *se_sess;



	ch = container_of(w, struct srpt_rdma_ch, release_work);

	pr_debug("ch = %p; ch->sess = %p; release_done = %p\n", ch, ch->sess,
@@ -2373,8 +2325,13 @@ static void srpt_release_channel_work(struct work_struct *w) 
	sdev = ch->sport->sdev;

	BUG_ON(!sdev);



	transport_deregister_session_configfs(ch->sess);

	transport_deregister_session(ch->sess);

	se_sess = ch->sess;

	BUG_ON(!se_sess);



	target_wait_for_sess_cmds(se_sess, 0);



	transport_deregister_session_configfs(se_sess);

	transport_deregister_session(se_sess);

	ch->sess = NULL;



	srpt_destroy_ch_ib(ch);
@@ -3099,7 +3056,7 @@ static int srpt_queue_response(struct se_cmd *cmd) 
		       ioctx->tag);

		srpt_unmap_sg_to_ib_sge(ch, ioctx);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

	}



out:
@@ -3490,6 +3447,23 @@ static u32 srpt_tpg_get_inst_index(struct se_portal_group *se_tpg) 


static void srpt_release_cmd(struct se_cmd *se_cmd)

{

	struct srpt_send_ioctx *ioctx = container_of(se_cmd,

				struct srpt_send_ioctx, cmd);

	struct srpt_rdma_ch *ch = ioctx->ch;

	unsigned long flags;



	WARN_ON(ioctx->state != SRPT_STATE_DONE);

	WARN_ON(ioctx->mapped_sg_count != 0);



	if (ioctx->n_rbuf > 1) {

		kfree(ioctx->rbufs);

		ioctx->rbufs = NULL;

		ioctx->n_rbuf = 0;

	}



	spin_lock_irqsave(&ch->spinlock, flags);

	list_add(&ioctx->free_list, &ch->free_list);

	spin_unlock_irqrestore(&ch->spinlock, flags);

}



/**

drivers/infiniband/ulp/srpt/ib_srpt.h

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ struct srpt_recv_ioctx { 
struct srpt_send_ioctx {

	struct srpt_ioctx	ioctx;

	struct srpt_rdma_ch	*ch;

	struct kref		 kref;

	struct rdma_iu		*rdma_ius;

	struct srp_direct_buf	*rbufs;

	struct srp_direct_buf	single_rbuf;

drivers/scsi/qla2xxx/qla_target.c

+20 −1
Original line number Diff line number Diff line
@@ -1264,8 +1264,27 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 
	struct abts_recv_from_24xx *abts, struct qla_tgt_sess *sess)

{

	struct qla_hw_data *ha = vha->hw;

	struct se_session *se_sess = sess->se_sess;

	struct qla_tgt_mgmt_cmd *mcmd;

	struct se_cmd *se_cmd;

	u32 lun = 0;

	int rc;

	bool found_lun = false;



	spin_lock(&se_sess->sess_cmd_lock);

	list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {

		struct qla_tgt_cmd *cmd =

			container_of(se_cmd, struct qla_tgt_cmd, se_cmd);

		if (cmd->tag == abts->exchange_addr_to_abort) {

			lun = cmd->unpacked_lun;

			found_lun = true;

			break;

		}

	}

	spin_unlock(&se_sess->sess_cmd_lock);



	if (!found_lun)

		return -ENOENT;



	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,

	    "qla_target(%d): task abort (tag=%d)\n",
@@ -1283,7 +1302,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 
	mcmd->sess = sess;

	memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));



	rc = ha->tgt.tgt_ops->handle_tmr(mcmd, 0, TMR_ABORT_TASK,

	rc = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, TMR_ABORT_TASK,

	    abts->exchange_addr_to_abort);

	if (rc != 0) {

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -620,8 +620,8 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work) 
			return;

		}



		cmd->se_cmd.scsi_sense_reason = TCM_CHECK_CONDITION_ABORT_CMD;

		transport_generic_request_failure(&cmd->se_cmd);

		transport_generic_request_failure(&cmd->se_cmd,

						  TCM_CHECK_CONDITION_ABORT_CMD);

		return;

	}

drivers/target/iscsi/iscsi_target.c

+30 −54
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static void iscsit_ack_from_expstatsn(struct iscsi_conn *conn, u32 exp_statsn) 
	list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {

		spin_lock(&cmd->istate_lock);

		if ((cmd->i_state == ISTATE_SENT_STATUS) &&

		    (cmd->stat_sn < exp_statsn)) {

		    iscsi_sna_lt(cmd->stat_sn, exp_statsn)) {

			cmd->i_state = ISTATE_REMOVE;

			spin_unlock(&cmd->istate_lock);

			iscsit_add_cmd_to_immediate_queue(cmd, conn,
@@ -767,8 +767,7 @@ static int iscsit_handle_scsi_cmd( 
	struct iscsi_conn *conn,

	unsigned char *buf)

{

	int	data_direction, cmdsn_ret = 0, immed_ret, ret, transport_ret;

	int	dump_immediate_data = 0, send_check_condition = 0, payload_length;

	int data_direction, payload_length, cmdsn_ret = 0, immed_ret;

	struct iscsi_cmd *cmd = NULL;

	struct iscsi_scsi_req *hdr;

	int iscsi_task_attr;
@@ -956,35 +955,23 @@ static int iscsit_handle_scsi_cmd( 
		" ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,

		hdr->cmdsn, hdr->data_length, payload_length, conn->cid);



	/*

	 * The CDB is going to an se_device_t.

	 */

	ret = transport_lookup_cmd_lun(&cmd->se_cmd,

	cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd,

						     scsilun_to_int(&hdr->lun));

	if (ret < 0) {

		if (cmd->se_cmd.scsi_sense_reason == TCM_NON_EXISTENT_LUN) {

			pr_debug("Responding to non-acl'ed,"

				" non-existent or non-exported iSCSI LUN:"

				" 0x%016Lx\n", get_unaligned_le64(&hdr->lun));

		}

		send_check_condition = 1;

	if (cmd->sense_reason)

		goto attach_cmd;

	}



	transport_ret = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);

	if (transport_ret == -ENOMEM) {

	cmd->sense_reason = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);

	if (cmd->sense_reason) {

		if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {

			return iscsit_add_reject_from_cmd(

					ISCSI_REASON_BOOKMARK_NO_RESOURCES,

					1, 1, buf, cmd);

	} else if (transport_ret < 0) {

		/*

		 * Unsupported SAM Opcode.  CHECK_CONDITION will be sent

		 * in iscsit_execute_cmd() during the CmdSN OOO Execution

		 * Mechinism.

		 */

		send_check_condition = 1;

	} else {

		if (iscsit_build_pdu_and_seq_lists(cmd, payload_length) < 0)

		}



		goto attach_cmd;

	}



	if (iscsit_build_pdu_and_seq_lists(cmd, payload_length) < 0) {

		return iscsit_add_reject_from_cmd(

			ISCSI_REASON_BOOKMARK_NO_RESOURCES,

			1, 1, buf, cmd);
@@ -1000,11 +987,12 @@ static int iscsit_handle_scsi_cmd( 
	 */

	core_alua_check_nonop_delay(&cmd->se_cmd);



	ret = iscsit_allocate_iovecs(cmd);

	if (ret < 0)

	if (iscsit_allocate_iovecs(cmd) < 0) {

		return iscsit_add_reject_from_cmd(

				ISCSI_REASON_BOOKMARK_NO_RESOURCES,

				1, 0, buf, cmd);

	}



	/*

	 * Check the CmdSN against ExpCmdSN/MaxCmdSN here if

	 * the Immediate Bit is not set, and no Immediate
@@ -1031,10 +1019,7 @@ static int iscsit_handle_scsi_cmd( 
	 * If no Immediate Data is attached, it's OK to return now.

	 */

	if (!cmd->immediate_data) {

		if (send_check_condition)

			return 0;



		if (cmd->unsolicited_data) {

		if (!cmd->sense_reason && cmd->unsolicited_data) {

			iscsit_set_dataout_sequence_values(cmd);



			spin_lock_bh(&cmd->dataout_timeout_lock);
@@ -1050,19 +1035,17 @@ static int iscsit_handle_scsi_cmd( 
	 * thread.  They are processed in CmdSN order by

	 * iscsit_check_received_cmdsn() below.

	 */

	if (send_check_condition) {

	if (cmd->sense_reason) {

		immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;

		dump_immediate_data = 1;

		goto after_immediate_data;

	}

	/*

	 * Call directly into transport_generic_new_cmd() to perform

	 * the backend memory allocation.

	 */

	ret = transport_generic_new_cmd(&cmd->se_cmd);

	if (ret < 0) {

	cmd->sense_reason = transport_generic_new_cmd(&cmd->se_cmd);

	if (cmd->sense_reason) {

		immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;

		dump_immediate_data = 1;

		goto after_immediate_data;

	}
@@ -1079,7 +1062,7 @@ static int iscsit_handle_scsi_cmd( 
		 * Special case for Unsupported SAM WRITE Opcodes

		 * and ImmediateData=Yes.

		 */

		if (dump_immediate_data) {

		if (cmd->sense_reason) {

			if (iscsit_dump_data_payload(conn, payload_length, 1) < 0)

				return -1;

		} else if (cmd->unsolicited_data) {
@@ -1272,8 +1255,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf) 
		spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);



		spin_lock_irqsave(&se_cmd->t_state_lock, flags);

		if (!(se_cmd->se_cmd_flags & SCF_SUPPORTED_SAM_OPCODE) ||

		     (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION))

		if (!(se_cmd->se_cmd_flags & SCF_SUPPORTED_SAM_OPCODE))

			dump_unsolicited_data = 1;

		spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
@@ -1742,7 +1724,6 @@ static int iscsit_handle_task_mgt_cmd( 
		ret = transport_lookup_tmr_lun(&cmd->se_cmd,

					       scsilun_to_int(&hdr->lun));

		if (ret < 0) {

			cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

			se_tmr->response = ISCSI_TMF_RSP_NO_LUN;

			goto attach;

		}
@@ -1751,10 +1732,8 @@ static int iscsit_handle_task_mgt_cmd( 
	switch (function) {

	case ISCSI_TM_FUNC_ABORT_TASK:

		se_tmr->response = iscsit_tmr_abort_task(cmd, buf);

		if (se_tmr->response != ISCSI_TMF_RSP_COMPLETE) {

			cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		if (se_tmr->response)

			goto attach;

		}

		break;

	case ISCSI_TM_FUNC_ABORT_TASK_SET:

	case ISCSI_TM_FUNC_CLEAR_ACA:
@@ -1763,14 +1742,12 @@ static int iscsit_handle_task_mgt_cmd( 
		break;

	case ISCSI_TM_FUNC_TARGET_WARM_RESET:

		if (iscsit_tmr_task_warm_reset(conn, tmr_req, buf) < 0) {

			cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

			se_tmr->response = ISCSI_TMF_RSP_AUTH_FAILED;

			goto attach;

		}

		break;

	case ISCSI_TM_FUNC_TARGET_COLD_RESET:

		if (iscsit_tmr_task_cold_reset(conn, tmr_req, buf) < 0) {

			cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

			se_tmr->response = ISCSI_TMF_RSP_AUTH_FAILED;

			goto attach;

		}
@@ -1781,7 +1758,7 @@ static int iscsit_handle_task_mgt_cmd( 
		 * Perform sanity checks on the ExpDataSN only if the

		 * TASK_REASSIGN was successful.

		 */

		if (se_tmr->response != ISCSI_TMF_RSP_COMPLETE)

		if (se_tmr->response)

			break;



		if (iscsit_check_task_reassign_expdatasn(tmr_req, conn) < 0)
@@ -1792,7 +1769,6 @@ static int iscsit_handle_task_mgt_cmd( 
	default:

		pr_err("Unknown TMR function: 0x%02x, protocol"

			" error.\n", function);

		cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;

		se_tmr->response = ISCSI_TMF_RSP_NOT_SUPPORTED;

		goto attach;

	}
@@ -2360,7 +2336,7 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn) 
	if (!conn_p)

		return;



	cmd = iscsit_allocate_cmd(conn_p, GFP_KERNEL);

	cmd = iscsit_allocate_cmd(conn_p, GFP_ATOMIC);

	if (!cmd) {

		iscsit_dec_conn_usage_count(conn_p);

		return;