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

Commit 8e78b7dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull second round of SCSI updates from James Bottomley:
 "There's one late arriving patch here (added today), fixing a build
  issue which the scsi_dh patch set in here uncovered.  Other than that,
  everything has been incubated in -next and the checkers for a week.

  The major pieces of this patch are a set patches facilitating better
  integration between scsi and scsi_dh (the device handling layer used
  by multi-path; all the dm parts are acked by Mike Snitzer).

  This also includes driver updates for mp3sas, scsi_debug and an
  assortment of bug fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (50 commits)
  scsi_dh: fix randconfig build error
  scsi: fix scsi_error_handler vs. scsi_host_dev_release race
  fcoe: Convert use of __constant_htons to htons
  mpt2sas: setpci reset kernel oops fix
  pm80xx: Don't override ts->stat on IO_OPEN_CNX_ERROR_HW_RESOURCE_BUSY
  lpfc: Fix possible use-after-free and double free in lpfc_mbx_cmpl_rdp_page_a2()
  bfa: Fix incorrect de-reference of pointer
  bfa: Fix indentation
  scsi_transport_sas: Remove check for SAS expander when querying bay/enclosure IDs.
  scsi_debug: resp_request: remove unused variable
  scsi_debug: fix REPORT LUNS Well Known LU
  scsi_debug: schedule_resp fix input variable check
  scsi_debug: make dump_sector static
  scsi_debug: vfree is null safe so drop the check
  scsi_debug: use SCSI_W_LUN_REPORT_LUNS instead of SAM2_WLUN_REPORT_LUNS;
  scsi_debug: define pr_fmt() for consistent logging
  mpt2sas: Refcount fw_events and fix unsafe list usage
  mpt2sas: Refcount sas_device objects and fix unsafe list usage
  scsi_dh: return SCSI_DH_NOTCONN in scsi_dh_activate()
  scsi_dh: don't allow to detach device handlers at runtime
  ...
parents 06a660ad 294ab783

drivers/md/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ config DM_MULTIPATH 
	# of SCSI_DH if the latter isn't defined but if

	# it is, DM_MULTIPATH must depend on it.  We get a build

	# error if SCSI_DH=m and DM_MULTIPATH=y

	depends on SCSI_DH || !SCSI_DH

	depends on !SCSI_DH || SCSI

	---help---

	  Allow volume managers to support multipath hardware.

drivers/md/dm-mpath.c

+6 −21
Original line number Diff line number Diff line
@@ -159,12 +159,9 @@ static struct priority_group *alloc_priority_group(void) 
static void free_pgpaths(struct list_head *pgpaths, struct dm_target *ti)

{

	struct pgpath *pgpath, *tmp;

	struct multipath *m = ti->private;



	list_for_each_entry_safe(pgpath, tmp, pgpaths, list) {

		list_del(&pgpath->list);

		if (m->hw_handler_name)

			scsi_dh_detach(bdev_get_queue(pgpath->path.dev->bdev));

		dm_put_device(ti, pgpath->path.dev);

		free_pgpath(pgpath);

	}
@@ -580,6 +577,7 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps 
		q = bdev_get_queue(p->path.dev->bdev);



	if (m->retain_attached_hw_handler) {

retain:

		attached_handler_name = scsi_dh_attached_handler_name(q, GFP_KERNEL);

		if (attached_handler_name) {

			/*
@@ -599,20 +597,14 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps 
	}



	if (m->hw_handler_name) {

		/*

		 * Increments scsi_dh reference, even when using an

		 * already-attached handler.

		 */

		r = scsi_dh_attach(q, m->hw_handler_name);

		if (r == -EBUSY) {

			/*

			 * Already attached to different hw_handler:

			 * try to reattach with correct one.

			 */

			scsi_dh_detach(q);

			r = scsi_dh_attach(q, m->hw_handler_name);

		}

			char b[BDEVNAME_SIZE];



			printk(KERN_INFO "dm-mpath: retaining handler on device %s\n",

				bdevname(p->path.dev->bdev, b));

			goto retain;

		}

		if (r < 0) {

			ti->error = "error attaching hardware handler";

			dm_put_device(ti, p->path.dev);
@@ -624,7 +616,6 @@ static struct pgpath *parse_path(struct dm_arg_set *as, struct path_selector *ps 
			if (r < 0) {

				ti->error = "unable to set hardware "

							"handler parameters";

				scsi_dh_detach(q);

				dm_put_device(ti, p->path.dev);

				goto bad;

			}
@@ -734,12 +725,6 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m) 
		return 0;



	m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);

	if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),

				     "scsi_dh_%s", m->hw_handler_name)) {

		ti->error = "unknown hardware handler type";

		ret = -EINVAL;

		goto fail;

	}



	if (hw_argc > 1) {

		char *p;

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o 
scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o

scsi_mod-y			+= scsi_trace.o scsi_logging.o

scsi_mod-$(CONFIG_PM)		+= scsi_pm.o

scsi_mod-$(CONFIG_SCSI_DH)	+= scsi_dh.o



hv_storvsc-y			:= storvsc_drv.o

drivers/scsi/aic94xx/aic94xx_sds.c

+3 −2
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, 
{

	int err, i;

	u32 offs, size;

	struct asd_ll_el *el;

	struct asd_ll_el *el = NULL;

	struct asd_ctrla_phy_settings *ps;

	struct asd_ctrla_phy_settings dflt_ps;
@@ -1004,6 +1004,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, 


		size = sizeof(struct asd_ctrla_phy_settings);

		ps = &dflt_ps;

		goto out_process;

	}



	if (size == 0)
@@ -1028,7 +1029,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, 
		ASD_DPRINTK("couldn't find ctrla phy settings struct\n");

		goto out2;

	}



out_process:

	err = asd_process_ctrla_phy_settings(asd_ha, ps);

	if (err) {

		ASD_DPRINTK("couldn't process ctrla phy settings\n");

drivers/scsi/bfa/bfa_ioc.c

+12 −12
Original line number Diff line number Diff line
@@ -3878,7 +3878,7 @@ bfa_sfp_show_comp(struct bfa_sfp_s *sfp, struct bfi_mbmsg_s *msg) 
		bfa_trc(sfp, sfp->data_valid);

		if (sfp->data_valid) {

			u32	size = sizeof(struct sfp_mem_s);

			u8 *des = (u8 *) &(sfp->sfpmem);

			u8 *des = (u8 *)(sfp->sfpmem);

			memcpy(des, sfp->dbuf_kva, size);

		}

		/*