Commit 5345da89 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:
 "Six fixes for mostly minor issues, most of which have small race
  windows for occurring"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Suppress a kernel warning in case the prep function returns BLKPREP_DEFER
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: aacraid: Fix controller initialization failure
  scsi: hpsa: Fix configured_logical_drive_count·check
  scsi: qla2xxx: Initialize Work element before requesting IRQs
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
parents ea678998 8fe8ffb1

drivers/s390/scsi/zfcp_aux.c

+5 −0
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) 


	adapter->next_port_scan = jiffies;



	adapter->erp_action.adapter = adapter;



	if (zfcp_qdio_setup(adapter))

		goto failed;
@@ -513,6 +515,9 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, 
	port->dev.groups = zfcp_port_attr_groups;

	port->dev.release = zfcp_port_release;



	port->erp_action.adapter = adapter;

	port->erp_action.port = port;



	if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) {

		kfree(port);

		goto err_out;

drivers/s390/scsi/zfcp_erp.c

+11 −7
Original line number Diff line number Diff line
@@ -193,9 +193,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE,

				&zfcp_sdev->status);

		erp_action = &zfcp_sdev->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		erp_action->port = port;

		erp_action->sdev = sdev;

		WARN_ON_ONCE(erp_action->port != port);

		WARN_ON_ONCE(erp_action->sdev != sdev);

		if (!(atomic_read(&zfcp_sdev->status) &

		      ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -208,8 +207,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		zfcp_erp_action_dismiss_port(port);

		atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &port->status);

		erp_action = &port->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		erp_action->port = port;

		WARN_ON_ONCE(erp_action->port != port);

		WARN_ON_ONCE(erp_action->sdev != NULL);

		if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;

		break;
@@ -219,7 +218,8 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		zfcp_erp_action_dismiss_adapter(adapter);

		atomic_or(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status);

		erp_action = &adapter->erp_action;

		memset(erp_action, 0, sizeof(struct zfcp_erp_action));

		WARN_ON_ONCE(erp_action->port != NULL);

		WARN_ON_ONCE(erp_action->sdev != NULL);

		if (!(atomic_read(&adapter->status) &

		      ZFCP_STATUS_COMMON_RUNNING))

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;
@@ -229,7 +229,11 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		return NULL;

	}



	erp_action->adapter = adapter;

	WARN_ON_ONCE(erp_action->adapter != adapter);

	memset(&erp_action->list, 0, sizeof(erp_action->list));

	memset(&erp_action->timer, 0, sizeof(erp_action->timer));

	erp_action->step = ZFCP_ERP_STEP_UNINITIALIZED;

	erp_action->fsf_req_id = 0;

	erp_action->action = need;

	erp_action->status = act_status;

drivers/s390/scsi/zfcp_scsi.c

+5 −0
Original line number Diff line number Diff line
@@ -115,10 +115,15 @@ static int zfcp_scsi_slave_alloc(struct scsi_device *sdev) 
	struct zfcp_unit *unit;

	int npiv = adapter->connection_features & FSF_FEATURE_NPIV_MODE;



	zfcp_sdev->erp_action.adapter = adapter;

	zfcp_sdev->erp_action.sdev = sdev;



	port = zfcp_get_port_by_wwpn(adapter, rport->port_name);

	if (!port)

		return -ENXIO;



	zfcp_sdev->erp_action.port = port;



	unit = zfcp_unit_find(port, zfcp_scsi_dev_lun(sdev));

	if (unit)

		put_device(&unit->dev);

drivers/scsi/aacraid/comminit.c

+5 −3
Original line number Diff line number Diff line
@@ -302,9 +302,11 @@ int aac_send_shutdown(struct aac_dev * dev) 
		return -ENOMEM;

	aac_fib_init(fibctx);



	if (!dev->adapter_shutdown) {

		mutex_lock(&dev->ioctl_mutex);

		dev->adapter_shutdown = 1;

		mutex_unlock(&dev->ioctl_mutex);

	}



	cmd = (struct aac_close *) fib_data(fibctx);

	cmd->command = cpu_to_le32(VM_CloseAll);

drivers/scsi/aacraid/linit.c

+6 −1
Original line number Diff line number Diff line
@@ -1551,8 +1551,9 @@ static void __aac_shutdown(struct aac_dev * aac) 
{

	int i;



	mutex_lock(&aac->ioctl_mutex);

	aac->adapter_shutdown = 1;

	aac_send_shutdown(aac);

	mutex_unlock(&aac->ioctl_mutex);



	if (aac->aif_thread) {

		int i;
@@ -1565,7 +1566,11 @@ static void __aac_shutdown(struct aac_dev * aac) 
		}

		kthread_stop(aac->thread);

	}



	aac_send_shutdown(aac);



	aac_adapter_disable_int(aac);



	if (aac_is_src(aac)) {

		if (aac->max_msix > 1) {

			for (i = 0; i < aac->max_msix; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE