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

Commit 946dd683 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull SCSI target fixes from Nicholas Bellinger:
 "Mostly minor fixes this time to v3.14-rc1 related changes.  Also
  included is one fix for a free after use regression in persistent
  reservations UNREGISTER logic that is CC'ed to >= v3.11.y stable"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  Target/sbc: Fix protection copy routine
  IB/srpt: replace strict_strtoul() with kstrtoul()
  target: Simplify command completion by removing CMD_T_FAILED flag
  iser-target: Fix leak on failure in isert_conn_create_fastreg_pool
  iscsi-target: Fix SNACK Type 1 + BegRun=0 handling
  target: Fix missing length check in spc_emulate_evpd_83()
  qla2xxx: Remove last vestiges of qla_tgt_cmd.cmd_list
  target: Fix 32-bit + CONFIG_LBDAF=n link error w/ sector_div
  target: Fix free-after-use regression in PR unregister
parents 2d0ef4fb d6a65fdc

drivers/infiniband/ulp/isert/ib_isert.c

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ isert_conn_create_fastreg_pool(struct isert_conn *isert_conn) 
		if (ret) {

			pr_err("Failed to create fastreg descriptor err=%d\n",

			       ret);

			kfree(fr_desc);

			goto err;

		}

drivers/infiniband/ulp/srpt/ib_srpt.c

+7 −7
Original line number Diff line number Diff line
@@ -3666,9 +3666,9 @@ static ssize_t srpt_tpg_attrib_store_srp_max_rdma_size( 
	unsigned long val;

	int ret;



	ret = strict_strtoul(page, 0, &val);

	ret = kstrtoul(page, 0, &val);

	if (ret < 0) {

		pr_err("strict_strtoul() failed with ret: %d\n", ret);

		pr_err("kstrtoul() failed with ret: %d\n", ret);

		return -EINVAL;

	}

	if (val > MAX_SRPT_RDMA_SIZE) {
@@ -3706,9 +3706,9 @@ static ssize_t srpt_tpg_attrib_store_srp_max_rsp_size( 
	unsigned long val;

	int ret;



	ret = strict_strtoul(page, 0, &val);

	ret = kstrtoul(page, 0, &val);

	if (ret < 0) {

		pr_err("strict_strtoul() failed with ret: %d\n", ret);

		pr_err("kstrtoul() failed with ret: %d\n", ret);

		return -EINVAL;

	}

	if (val > MAX_SRPT_RSP_SIZE) {
@@ -3746,9 +3746,9 @@ static ssize_t srpt_tpg_attrib_store_srp_sq_size( 
	unsigned long val;

	int ret;



	ret = strict_strtoul(page, 0, &val);

	ret = kstrtoul(page, 0, &val);

	if (ret < 0) {

		pr_err("strict_strtoul() failed with ret: %d\n", ret);

		pr_err("kstrtoul() failed with ret: %d\n", ret);

		return -EINVAL;

	}

	if (val > MAX_SRPT_SRQ_SIZE) {
@@ -3793,7 +3793,7 @@ static ssize_t srpt_tpg_store_enable( 
	unsigned long tmp;

        int ret;



	ret = strict_strtoul(page, 0, &tmp);

	ret = kstrtoul(page, 0, &tmp);

	if (ret < 0) {

		printk(KERN_ERR "Unable to extract srpt_tpg_store_enable\n");

		return -EINVAL;

drivers/scsi/qla2xxx/qla_target.c

+0 −2
Original line number Diff line number Diff line
@@ -2595,8 +2595,6 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha, 
		return -ENOMEM;

	}



	INIT_LIST_HEAD(&cmd->cmd_list);



	memcpy(&cmd->atio, atio, sizeof(*atio));

	cmd->state = QLA_TGT_STATE_NEW;

	cmd->tgt = vha->vha_tgt.qla_tgt;

drivers/scsi/qla2xxx/qla_target.h

+0 −1
Original line number Diff line number Diff line
@@ -855,7 +855,6 @@ struct qla_tgt_cmd { 
	uint16_t loop_id;	/* to save extra sess dereferences */

	struct qla_tgt *tgt;	/* to save extra sess dereferences */

	struct scsi_qla_host *vha;

	struct list_head cmd_list;



	struct atio_from_isp atio;

};

drivers/target/iscsi/iscsi_target_erl1.c

+3 −1
Original line number Diff line number Diff line
@@ -507,7 +507,9 @@ int iscsit_handle_status_snack( 
	u32 last_statsn;

	int found_cmd;



	if (conn->exp_statsn > begrun) {

	if (!begrun) {

		begrun = conn->exp_statsn;

	} else if (conn->exp_statsn > begrun) {

		pr_err("Got Status SNACK Begrun: 0x%08x, RunLength:"

			" 0x%08x but already got ExpStatSN: 0x%08x on CID:"

			" %hu.\n", begrun, runlength, conn->exp_statsn,