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

Commit 34a9d2c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch '3.2-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

* '3.2-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (25 commits)
  iscsi-target: Fix hex2bin warn_unused compile message
  target: Don't return an error if disabling unsupported features
  target/rd: fix or rewrite the copy routine
  target/rd: simplify the page/offset computation
  target: remove the unused se_dev_list
  target/file: walk properly over sg list
  target: remove unused struct fields
  target: Fix page length in emulated INQUIRY VPD page 86h
  target: Handle 0 correctly in transport_get_sectors_6()
  target: Don't return an error status for 0-length READ and WRITE
  iscsi-target: Use kmemdup rather than duplicating its implementation
  iscsi-target: Add missing F_BIT for iscsi_tm_rsp
  iscsi-target: Fix residual count hanlding + remove iscsi_cmd->residual_count
  target: Reject SCSI data overflow for fabrics using transport_generic_map_mem_to_cmd
  target: remove the unused t_task_pt_sgl and t_task_pt_sgl_num se_cmd fields
  target: remove the t_tasks_bidi se_cmd field
  target: remove the t_tasks_fua se_cmd field
  target: remove the se_ordered_node se_cmd field
  target: remove the se_obj_ptr and se_orig_obj_ptr se_cmd fields
  target: Drop config_item_name usage in fabric TFO->free_wwn()
  ...
parents a694ad94 ddca8f3e

drivers/target/iscsi/iscsi_target.c

+11 −15
Original line number Diff line number Diff line
@@ -614,13 +614,12 @@ int iscsit_add_reject( 
	hdr	= (struct iscsi_reject *) cmd->pdu;

	hdr->reason = reason;



	cmd->buf_ptr = kzalloc(ISCSI_HDR_LEN, GFP_KERNEL);

	cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL);

	if (!cmd->buf_ptr) {

		pr_err("Unable to allocate memory for cmd->buf_ptr\n");

		iscsit_release_cmd(cmd);

		return -1;

	}

	memcpy(cmd->buf_ptr, buf, ISCSI_HDR_LEN);



	spin_lock_bh(&conn->cmd_lock);

	list_add_tail(&cmd->i_list, &conn->conn_cmd_list);
@@ -661,13 +660,12 @@ int iscsit_add_reject_from_cmd( 
	hdr	= (struct iscsi_reject *) cmd->pdu;

	hdr->reason = reason;



	cmd->buf_ptr = kzalloc(ISCSI_HDR_LEN, GFP_KERNEL);

	cmd->buf_ptr = kmemdup(buf, ISCSI_HDR_LEN, GFP_KERNEL);

	if (!cmd->buf_ptr) {

		pr_err("Unable to allocate memory for cmd->buf_ptr\n");

		iscsit_release_cmd(cmd);

		return -1;

	}

	memcpy(cmd->buf_ptr, buf, ISCSI_HDR_LEN);



	if (add_to_conn) {

		spin_lock_bh(&conn->cmd_lock);
@@ -1017,11 +1015,6 @@ static int iscsit_handle_scsi_cmd( 
				" non-existent or non-exported iSCSI LUN:"

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

		}

		if (ret == PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES)

			return iscsit_add_reject_from_cmd(

					ISCSI_REASON_BOOKMARK_NO_RESOURCES,

					1, 1, buf, cmd);



		send_check_condition = 1;

		goto attach_cmd;

	}
@@ -1044,6 +1037,8 @@ static int iscsit_handle_scsi_cmd( 
		 */

		send_check_condition = 1;

	} else {

		cmd->data_length = cmd->se_cmd.data_length;



		if (iscsit_decide_list_to_build(cmd, payload_length) < 0)

			return iscsit_add_reject_from_cmd(

				ISCSI_REASON_BOOKMARK_NO_RESOURCES,
@@ -1123,7 +1118,7 @@ static int iscsit_handle_scsi_cmd( 
	 * the backend memory allocation.

	 */

	ret = transport_generic_new_cmd(&cmd->se_cmd);

	if ((ret < 0) || (cmd->se_cmd.se_cmd_flags & SCF_SE_CMD_FAILED)) {

	if (ret < 0) {

		immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;

		dump_immediate_data = 1;

		goto after_immediate_data;
@@ -1341,7 +1336,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf) 


		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_SE_CMD_FAILED))

		     (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION))

			dump_unsolicited_data = 1;

		spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
@@ -2513,10 +2508,10 @@ static int iscsit_send_data_in( 
	if (hdr->flags & ISCSI_FLAG_DATA_STATUS) {

		if (cmd->se_cmd.se_cmd_flags & SCF_OVERFLOW_BIT) {

			hdr->flags |= ISCSI_FLAG_DATA_OVERFLOW;

			hdr->residual_count = cpu_to_be32(cmd->residual_count);

			hdr->residual_count = cpu_to_be32(cmd->se_cmd.residual_count);

		} else if (cmd->se_cmd.se_cmd_flags & SCF_UNDERFLOW_BIT) {

			hdr->flags |= ISCSI_FLAG_DATA_UNDERFLOW;

			hdr->residual_count = cpu_to_be32(cmd->residual_count);

			hdr->residual_count = cpu_to_be32(cmd->se_cmd.residual_count);

		}

	}

	hton24(hdr->dlength, datain.length);
@@ -3018,10 +3013,10 @@ static int iscsit_send_status( 
	hdr->flags		|= ISCSI_FLAG_CMD_FINAL;

	if (cmd->se_cmd.se_cmd_flags & SCF_OVERFLOW_BIT) {

		hdr->flags |= ISCSI_FLAG_CMD_OVERFLOW;

		hdr->residual_count = cpu_to_be32(cmd->residual_count);

		hdr->residual_count = cpu_to_be32(cmd->se_cmd.residual_count);

	} else if (cmd->se_cmd.se_cmd_flags & SCF_UNDERFLOW_BIT) {

		hdr->flags |= ISCSI_FLAG_CMD_UNDERFLOW;

		hdr->residual_count = cpu_to_be32(cmd->residual_count);

		hdr->residual_count = cpu_to_be32(cmd->se_cmd.residual_count);

	}

	hdr->response		= cmd->iscsi_response;

	hdr->cmd_status		= cmd->se_cmd.scsi_status;
@@ -3133,6 +3128,7 @@ static int iscsit_send_task_mgt_rsp( 
	hdr			= (struct iscsi_tm_rsp *) cmd->pdu;

	memset(hdr, 0, ISCSI_HDR_LEN);

	hdr->opcode		= ISCSI_OP_SCSI_TMFUNC_RSP;

	hdr->flags		= ISCSI_FLAG_CMD_FINAL;

	hdr->response		= iscsit_convert_tcm_tmr_rsp(se_tmr);

	hdr->itt		= cpu_to_be32(cmd->init_task_tag);

	cmd->stat_sn		= conn->stat_sn++;

drivers/target/iscsi/iscsi_target_auth.c

+4 −2
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ 


static int chap_string_to_hex(unsigned char *dst, unsigned char *src, int len)

{

	int j = DIV_ROUND_UP(len, 2);

	int j = DIV_ROUND_UP(len, 2), rc;



	hex2bin(dst, src, j);

	rc = hex2bin(dst, src, j);

	if (rc < 0)

		pr_debug("CHAP string contains non hex digit symbols\n");



	dst[j] = '\0';

	return j;

drivers/target/iscsi/iscsi_target_core.h

+0 −3
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ struct iscsi_cmd { 
	u32			pdu_send_order;

	/* Current struct iscsi_pdu in struct iscsi_cmd->pdu_list */

	u32			pdu_start;

	u32			residual_count;

	/* Next struct iscsi_seq to send in struct iscsi_cmd->seq_list */

	u32			seq_send_order;

	/* Number of struct iscsi_seq in struct iscsi_cmd->seq_list */
@@ -535,7 +534,6 @@ struct iscsi_conn { 
	atomic_t		connection_exit;

	atomic_t		connection_recovery;

	atomic_t		connection_reinstatement;

	atomic_t		connection_wait;

	atomic_t		connection_wait_rcfr;

	atomic_t		sleep_on_conn_wait_comp;

	atomic_t		transport_failed;
@@ -643,7 +641,6 @@ struct iscsi_session { 
	atomic_t		session_reinstatement;

	atomic_t		session_stop_active;

	atomic_t		sleep_on_sess_wait_comp;

	atomic_t		transport_wait_cmds;

	/* connection list */

	struct list_head	sess_conn_list;

	struct list_head	cr_active_list;

drivers/target/iscsi/iscsi_target_erl1.c

+1 −2
Original line number Diff line number Diff line
@@ -938,8 +938,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo) 
		 * handle the SCF_SCSI_RESERVATION_CONFLICT case here as well.

		 */

		if (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION) {

			if (se_cmd->se_cmd_flags &

					SCF_SCSI_RESERVATION_CONFLICT) {

			if (se_cmd->scsi_sense_reason == TCM_RESERVATION_CONFLICT) {

				cmd->i_state = ISTATE_SEND_STATUS;

				spin_unlock_bh(&cmd->istate_lock);

				iscsit_add_cmd_to_response_queue(cmd, cmd->conn,

drivers/target/iscsi/iscsi_target_login.c

+8 −5
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int iscsi_login_zero_tsih_s1( 
		iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,

				ISCSI_LOGIN_STATUS_NO_RESOURCES);

		pr_err("Could not allocate memory for session\n");

		return -1;

		return -ENOMEM;

	}



	iscsi_login_set_conn_values(sess, conn, pdu->cid);
@@ -250,7 +250,8 @@ static int iscsi_login_zero_tsih_s1( 
		pr_err("idr_pre_get() for sess_idr failed\n");

		iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,

				ISCSI_LOGIN_STATUS_NO_RESOURCES);

		return -1;

		kfree(sess);

		return -ENOMEM;

	}

	spin_lock(&sess_idr_lock);

	idr_get_new(&sess_idr, NULL, &sess->session_index);
@@ -270,14 +271,16 @@ static int iscsi_login_zero_tsih_s1( 
				ISCSI_LOGIN_STATUS_NO_RESOURCES);

		pr_err("Unable to allocate memory for"

				" struct iscsi_sess_ops.\n");

		return -1;

		kfree(sess);

		return -ENOMEM;

	}



	sess->se_sess = transport_init_session();

	if (!sess->se_sess) {

	if (IS_ERR(sess->se_sess)) {

		iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,

				ISCSI_LOGIN_STATUS_NO_RESOURCES);

		return -1;

		kfree(sess);

		return -ENOMEM;

	}



	return 0;