Commit c70b5296 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (84 commits)
  [SCSI] be2iscsi: SGE Len == 64K
  [SCSI] be2iscsi: Remove premature free of cid
  [SCSI] be2iscsi: More time for FW
  [SCSI] libsas: fix bug for vacant phy
  [SCSI] sd: Fix overflow with big physical blocks
  [SCSI] st: add MTWEOFI to write filemarks without flushing drive buffer
  [SCSI] libsas: Don't issue commands to devices that have been hot-removed
  [SCSI] megaraid_sas: Add Online Controller Reset to MegaRAID SAS drive
  [SCSI] lpfc 8.3.17: Update lpfc driver version to 8.3.17
  [SCSI] lpfc 8.3.17: Replace function reset methodology
  [SCSI] lpfc 8.3.17: SCSI fixes
  [SCSI] lpfc 8.3.17: BSG fixes
  [SCSI] lpfc 8.3.17: SLI Additions and Fixes
  [SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes
  [SCSI] zfcp: Remove scsi_cmnd->serial_number from debug traces
  [SCSI] ipr: fix array error logging
  [SCSI] aha152x: enable PCMCIA on 64bit
  [SCSI] scsi_dh_alua: Handle all states correctly
  [SCSI] cxgb4i: connection and ddp setting update
  [SCSI] cxgb3i: fixed connection over vlan
  ...
parents 80c226fb 58ff4bd0

Documentation/scsi/st.txt

+14 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ This file contains brief information about the SCSI tape driver. 
The driver is currently maintained by Kai Mäkisara (email

Kai.Makisara@kolumbus.fi)



Last modified: Sun Feb 24 21:59:07 2008 by kai.makisara

Last modified: Sun Aug 29 18:25:47 2010 by kai.makisara





BASICS
@@ -85,6 +85,17 @@ writing and the last operation has been a write. Two filemarks can be 
optionally written. In both cases end of data is signified by

returning zero bytes for two consecutive reads.



Writing filemarks without the immediate bit set in the SCSI command block acts

as a synchronization point, i.e., all remaining data form the drive buffers is

written to tape before the command returns. This makes sure that write errors

are caught at that point, but this takes time. In some applications, several

consecutive files must be written fast. The MTWEOFI operation can be used to

write the filemarks without flushing the drive buffer. Writing filemark at

close() is always flushing the drive buffers. However, if the previous

operation is MTWEOFI, close() does not write a filemark. This can be used if

the program wants to close/open the tape device between files and wants to

skip waiting.



If rewind, offline, bsf, or seek is done and previous tape operation was

write, a filemark is written before moving tape.
@@ -301,6 +312,8 @@ MTBSR Space backward over count records. 
MTFSS   Space forward over count setmarks.

MTBSS   Space backward over count setmarks.

MTWEOF  Write count filemarks.

MTWEOFI	Write count filemarks with immediate bit set (i.e., does not

	wait until data is on tape)

MTWSM   Write count setmarks.

MTREW   Rewind tape.

MTOFFL  Set device off line (often rewind plus eject).

drivers/message/fusion/mptbase.c

+3 −1
Original line number Diff line number Diff line
@@ -5945,8 +5945,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) 
		goto out;



	mem = kmalloc(iocpage2sz, GFP_KERNEL);

	if (!mem)

	if (!mem) {

		rc = -ENOMEM;

		goto out;

	}



	memcpy(mem, (u8 *)pIoc2, iocpage2sz);

	ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem;

drivers/s390/scsi/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for the S/390 specific device drivers

#



zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_scsi.o zfcp_erp.o zfcp_qdio.o \

	     zfcp_fsf.o zfcp_dbf.o zfcp_sysfs.o zfcp_fc.o zfcp_cfdc.o

zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_cfdc.o zfcp_dbf.o zfcp_erp.o \

	     zfcp_fc.o zfcp_fsf.o zfcp_qdio.o zfcp_scsi.o zfcp_sysfs.o \

	     zfcp_unit.o



obj-$(CONFIG_ZFCP) += zfcp.o

drivers/s390/scsi/zfcp_aux.c

+6 −120
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	struct ccw_device *cdev;

	struct zfcp_adapter *adapter;

	struct zfcp_port *port;

	struct zfcp_unit *unit;



	cdev = get_ccwdev_by_busid(&zfcp_ccw_driver, busid);

	if (!cdev)
@@ -72,17 +71,11 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	port = zfcp_get_port_by_wwpn(adapter, wwpn);

	if (!port)

		goto out_port;

	flush_work(&port->rport_work);



	unit = zfcp_unit_enqueue(port, lun);

	if (IS_ERR(unit))

		goto out_unit;



	zfcp_erp_unit_reopen(unit, 0, "auidc_1", NULL);

	zfcp_erp_wait(adapter);

	flush_work(&unit->scsi_work);



out_unit:

	zfcp_unit_add(port, lun);

	put_device(&port->dev);



out_port:

	zfcp_ccw_adapter_put(adapter);

out_ccw_device:
@@ -158,6 +151,9 @@ static int __init zfcp_module_init(void) 
		fc_attach_transport(&zfcp_transport_functions);

	if (!zfcp_data.scsi_transport_template)

		goto out_transport;

	scsi_transport_reserve_device(zfcp_data.scsi_transport_template,

				      sizeof(struct zfcp_scsi_dev));





	retval = misc_register(&zfcp_cfdc_misc);

	if (retval) {
@@ -210,30 +206,6 @@ static void __exit zfcp_module_exit(void) 


module_exit(zfcp_module_exit);



/**

 * zfcp_get_unit_by_lun - find unit in unit list of port by FCP LUN

 * @port: pointer to port to search for unit

 * @fcp_lun: FCP LUN to search for

 *

 * Returns: pointer to zfcp_unit or NULL

 */

struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *port, u64 fcp_lun)

{

	unsigned long flags;

	struct zfcp_unit *unit;



	read_lock_irqsave(&port->unit_list_lock, flags);

	list_for_each_entry(unit, &port->unit_list, list)

		if (unit->fcp_lun == fcp_lun) {

			if (!get_device(&unit->dev))

				unit = NULL;

			read_unlock_irqrestore(&port->unit_list_lock, flags);

			return unit;

		}

	read_unlock_irqrestore(&port->unit_list_lock, flags);

	return NULL;

}



/**

 * zfcp_get_port_by_wwpn - find port in port list of adapter by wwpn

 * @adapter: pointer to adapter to search for port
@@ -259,92 +231,6 @@ struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter, 
	return NULL;

}



/**

 * zfcp_unit_release - dequeue unit

 * @dev: pointer to device

 *

 * waits until all work is done on unit and removes it then from the unit->list

 * of the associated port.

 */

static void zfcp_unit_release(struct device *dev)

{

	struct zfcp_unit *unit = container_of(dev, struct zfcp_unit, dev);



	put_device(&unit->port->dev);

	kfree(unit);

}



/**

 * zfcp_unit_enqueue - enqueue unit to unit list of a port.

 * @port: pointer to port where unit is added

 * @fcp_lun: FCP LUN of unit to be enqueued

 * Returns: pointer to enqueued unit on success, ERR_PTR on error

 *

 * Sets up some unit internal structures and creates sysfs entry.

 */

struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)

{

	struct zfcp_unit *unit;

	int retval = -ENOMEM;



	get_device(&port->dev);



	unit = zfcp_get_unit_by_lun(port, fcp_lun);

	if (unit) {

		put_device(&unit->dev);

		retval = -EEXIST;

		goto err_out;

	}



	unit = kzalloc(sizeof(struct zfcp_unit), GFP_KERNEL);

	if (!unit)

		goto err_out;



	unit->port = port;

	unit->fcp_lun = fcp_lun;

	unit->dev.parent = &port->dev;

	unit->dev.release = zfcp_unit_release;



	if (dev_set_name(&unit->dev, "0x%016llx",

			 (unsigned long long) fcp_lun)) {

		kfree(unit);

		goto err_out;

	}

	retval = -EINVAL;



	INIT_WORK(&unit->scsi_work, zfcp_scsi_scan_work);



	spin_lock_init(&unit->latencies.lock);

	unit->latencies.write.channel.min = 0xFFFFFFFF;

	unit->latencies.write.fabric.min = 0xFFFFFFFF;

	unit->latencies.read.channel.min = 0xFFFFFFFF;

	unit->latencies.read.fabric.min = 0xFFFFFFFF;

	unit->latencies.cmd.channel.min = 0xFFFFFFFF;

	unit->latencies.cmd.fabric.min = 0xFFFFFFFF;



	if (device_register(&unit->dev)) {

		put_device(&unit->dev);

		goto err_out;

	}



	if (sysfs_create_group(&unit->dev.kobj, &zfcp_sysfs_unit_attrs))

		goto err_out_put;



	write_lock_irq(&port->unit_list_lock);

	list_add_tail(&unit->list, &port->unit_list);

	write_unlock_irq(&port->unit_list_lock);



	atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status);



	return unit;



err_out_put:

	device_unregister(&unit->dev);

err_out:

	put_device(&port->dev);

	return ERR_PTR(retval);

}



static int zfcp_allocate_low_mem_buffers(struct zfcp_adapter *adapter)

{

	adapter->pool.erp_req =

drivers/s390/scsi/zfcp_ccw.c

+4 −13
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ static int zfcp_ccw_activate(struct ccw_device *cdev) 
	if (!adapter)

		return 0;



	zfcp_erp_modify_adapter_status(adapter, "ccresu1", NULL,

				       ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET);

	zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);

	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

				"ccresu2", NULL);

	zfcp_erp_wait(adapter);
@@ -164,14 +163,7 @@ static int zfcp_ccw_set_online(struct ccw_device *cdev) 
	BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));

	adapter->req_no = 0;



	zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL,

				       ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET);

	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

				"ccsonl2", NULL);

	zfcp_erp_wait(adapter);



	flush_work(&adapter->scan_work);



	zfcp_ccw_activate(cdev);

	zfcp_ccw_adapter_put(adapter);

	return 0;

}
@@ -224,9 +216,8 @@ static int zfcp_ccw_notify(struct ccw_device *cdev, int event) 
		break;

	case CIO_OPER:

		dev_info(&cdev->dev, "The FCP device is operational again\n");

		zfcp_erp_modify_adapter_status(adapter, "ccnoti3", NULL,

					       ZFCP_STATUS_COMMON_RUNNING,

					       ZFCP_SET);

		zfcp_erp_set_adapter_status(adapter,

					    ZFCP_STATUS_COMMON_RUNNING);

		zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

					"ccnoti4", NULL);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE