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

Commit 61bd1e85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (53 commits)
  [SCSI] libosd: OSD2r05: on-the-wire changes for latest OSD2 revision 5.
  [SCSI] libosd: OSD2r05: OSD_CRYPTO_KEYID_SIZE will grow 20 => 32 bytes
  [SCSI] libosd: OSD2r05: Prepare for rev5 attribute list changes
  [SCSI] libosd: fix potential ERR_PTR dereference in osd_initiator.c
  [SCSI] mpt2sas : bump driver version to 01.100.02.00
  [SCSI] mpt2sas: fix hotplug event processing
  [SCSI] mpt2sas : release diagnotic buffers prior host reset
  [SCSI] mpt2sas : Broadcast Primative AEN bug fix
  [SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time
  [SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
  [SCSI] mpt2sas : running out of message frames
  [SCSI] mpt2sas : fix oops when firmware sends large sense buffer size
  [SCSI] mpt2sas : the sanity check in base_interrupt needs to be on dword boundary
  [SCSI] mpt2sas : unique ioctl magic number
  [SCSI] fix sign extension with 1.5TB usb-storage LBD=y
  [SCSI] ipr: Fix sleeping function called with interrupts disabled
  [SCSI] fcoe: fip: add multicast filter to receive FIP advertisements.
  [SCSI] libfc: Fix compilation warnings with allmodconfig
  [SCSI] fcoe: fix spelling typos and bad comments
  [SCSI] fcoe: don't export functions that are internal to fcoe
  ...
parents 8c0c3f7f e9da4d7f

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −0
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler= iscsi_eh_target_reset,

	.target_alloc		= iscsi_target_alloc,

	.use_clustering         = DISABLE_CLUSTERING,

	.proc_name              = "iscsi_iser",

	.this_id                = -1,

drivers/s390/scsi/zfcp_aux.c

+5 −6
Original line number Diff line number Diff line
@@ -97,9 +97,7 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	ccw_device_set_online(adapter->ccw_device);



	zfcp_erp_wait(adapter);

	wait_event(adapter->erp_done_wqh,

		   !(atomic_read(&unit->status) &

				ZFCP_STATUS_UNIT_SCSI_WORK_PENDING));

	flush_work(&unit->scsi_work);



	down(&zfcp_data.config_sema);

	zfcp_unit_put(unit);
@@ -279,6 +277,7 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun) 


	atomic_set(&unit->refcount, 0);

	init_waitqueue_head(&unit->remove_wq);

	INIT_WORK(&unit->scsi_work, zfcp_scsi_scan);



	unit->port = port;

	unit->fcp_lun = fcp_lun;
@@ -525,6 +524,8 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 


	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);



	zfcp_fc_nameserver_init(adapter);



	if (!zfcp_adapter_scsi_register(adapter))

		return 0;
@@ -553,7 +554,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 


	cancel_work_sync(&adapter->scan_work);

	cancel_work_sync(&adapter->stat_work);

	cancel_delayed_work_sync(&adapter->nsp.work);

	zfcp_adapter_scsi_unregister(adapter);

	sysfs_remove_group(&adapter->ccw_device->dev.kobj,

			   &zfcp_sysfs_adapter_attrs);
@@ -671,8 +671,7 @@ void zfcp_port_dequeue(struct zfcp_port *port) 
	list_del(&port->list);

	write_unlock_irq(&zfcp_data.config_lock);

	if (port->rport)

		fc_remote_port_delete(port->rport);

	port->rport = NULL;

		port->rport->dd_data = NULL;

	zfcp_adapter_put(port->adapter);

	sysfs_remove_group(&port->sysfs_device.kobj, &zfcp_sysfs_port_attrs);

	device_unregister(&port->sysfs_device);

drivers/s390/scsi/zfcp_ccw.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device) 
	/* initialize request counter */

	BUG_ON(!zfcp_reqlist_isempty(adapter));

	adapter->req_no = 0;

	zfcp_fc_nameserver_init(adapter);



	zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL,

				       ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET);

drivers/s390/scsi/zfcp_cfdc.c

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Userspace interface for accessing the

 * Access Control Lists / Control File Data Channel

 *

 * Copyright IBM Corporation 2008

 * Copyright IBM Corporation 2008, 2009

 */



#define KMSG_COMPONENT "zfcp"
@@ -197,6 +197,7 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command, 
		retval = -ENXIO;

		goto free_buffer;

	}

	zfcp_adapter_get(adapter);



	retval = zfcp_cfdc_sg_setup(data->command, fsf_cfdc->sg,

				    data_user->control_file);

drivers/s390/scsi/zfcp_def.h

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ enum zfcp_wka_status { 
/* logical unit status */

#define ZFCP_STATUS_UNIT_SHARED			0x00000004

#define ZFCP_STATUS_UNIT_READONLY		0x00000008

#define ZFCP_STATUS_UNIT_SCSI_WORK_PENDING	0x00000020



/* FSF request status (this does not have a common part) */

#define ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT	0x00000002
@@ -530,6 +529,7 @@ struct zfcp_unit { 
	struct zfcp_erp_action erp_action;     /* pending error recovery */

        atomic_t               erp_counter;

	struct zfcp_latencies	latencies;

	struct work_struct	scsi_work;

};



/* FSF request */