Commit 9a689bc4 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:
  [SCSI] stex: switch to block timeout
  [SCSI] make scsi_eh_try_stu use block timeout
  [SCSI] megaraid_sas: switch to block timeout
  [SCSI] ibmvscsi: switch to block timeout
  [SCSI] aacraid: switch to block timeout
  [SCSI] zfcp: prevent double decrement on host_busy while being busy
  [SCSI] zfcp: fix deadlock between wq triggered port scan and ERP
  [SCSI] zfcp: eliminate race between validation and locking
  [SCSI] zfcp: verify for correct rport state before scanning for SCSI devs
  [SCSI] zfcp: returning an ERR_PTR where a NULL value is expected
  [SCSI] zfcp: Fix opening of wka ports
  [SCSI] zfcp: fix remote port status check
  [SCSI] fc_transport: fix old bug on bitflag definitions
  [SCSI] Fix hang in starved list processing
parents 1122b19b dc5c49bf

drivers/s390/scsi/zfcp_erp.c

+5 −2
Original line number Diff line number Diff line
@@ -720,7 +720,6 @@ static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act, 
		goto failed_openfcp;



	atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status);

	schedule_work(&act->adapter->scan_work);



	return ZFCP_ERP_SUCCEEDED;
@@ -1186,6 +1185,8 @@ static void zfcp_erp_scsi_scan(struct work_struct *work) 
		container_of(work, struct zfcp_erp_add_work, work);

	struct zfcp_unit *unit = p->unit;

	struct fc_rport *rport = unit->port->rport;



	if (rport && rport->port_state == FC_PORTSTATE_ONLINE)

		scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,

			 scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);

	atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
@@ -1282,6 +1283,8 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) 
	case ZFCP_ERP_ACTION_REOPEN_ADAPTER:

		if (result != ZFCP_ERP_SUCCEEDED)

			zfcp_erp_rports_del(adapter);

		else

			schedule_work(&adapter->scan_work);

		zfcp_adapter_put(adapter);

		break;

	}

drivers/s390/scsi/zfcp_fc.c

+3 −4
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port) 
	if (mutex_lock_interruptible(&wka_port->mutex))

		return -ERESTARTSYS;



	if (wka_port->status != ZFCP_WKA_PORT_ONLINE) {

	if (wka_port->status == ZFCP_WKA_PORT_OFFLINE ||

	    wka_port->status == ZFCP_WKA_PORT_CLOSING) {

		wka_port->status = ZFCP_WKA_PORT_OPENING;

		if (zfcp_fsf_open_wka_port(wka_port))

			wka_port->status = ZFCP_WKA_PORT_OFFLINE;
@@ -125,8 +126,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, 


	read_lock_irqsave(&zfcp_data.config_lock, flags);

	list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {

		/* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */

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

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

			/* Try to connect to unused ports anyway. */

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,
@@ -610,7 +610,6 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter) 
	int ret, i;

	struct zfcp_gpn_ft *gpn_ft;



	zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */

	if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)

		return 0;

drivers/s390/scsi/zfcp_fsf.c

+14 −6
Original line number Diff line number Diff line
@@ -930,8 +930,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,

				  req_flags, adapter->pool.fsf_req_abort);

	if (IS_ERR(req))

	if (IS_ERR(req)) {

		req = NULL;

		goto out;

	}



	if (unlikely(!(atomic_read(&unit->status) &

		       ZFCP_STATUS_COMMON_UNBLOCKED)))
@@ -1584,6 +1586,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) 
		wka_port->status = ZFCP_WKA_PORT_OFFLINE;

		break;

	case FSF_PORT_ALREADY_OPEN:

		break;

	case FSF_GOOD:

		wka_port->handle = header->port_handle;

		wka_port->status = ZFCP_WKA_PORT_ONLINE;
@@ -2113,18 +2116,21 @@ static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req) 


static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)

{

	struct scsi_cmnd *scpnt = req->data;

	struct scsi_cmnd *scpnt;

	struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *)

	    &(req->qtcb->bottom.io.fcp_rsp);

	u32 sns_len;

	char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1];

	unsigned long flags;



	if (unlikely(!scpnt))

		return;



	read_lock_irqsave(&req->adapter->abort_lock, flags);



	scpnt = req->data;

	if (unlikely(!scpnt)) {

		read_unlock_irqrestore(&req->adapter->abort_lock, flags);

		return;

	}



	if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) {

		set_host_byte(scpnt, DID_SOFT_ERROR);

		set_driver_byte(scpnt, SUGGEST_RETRY);
@@ -2442,8 +2448,10 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,

				  adapter->pool.fsf_req_scsi);

	if (IS_ERR(req))

	if (IS_ERR(req)) {

		req = NULL;

		goto out;

	}



	req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;

	req->data = unit;

drivers/s390/scsi/zfcp_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt, 
	ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0,

					     ZFCP_REQ_AUTO_CLEANUP);

	if (unlikely(ret == -EBUSY))

		zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT);

		return SCSI_MLQUEUE_DEVICE_BUSY;

	else if (unlikely(ret < 0))

		return SCSI_MLQUEUE_HOST_BUSY;

drivers/scsi/aacraid/linit.c

+2 −2
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev) 
		 * Firmware has an individual device recovery time typically

		 * of 35 seconds, give us a margin.

		 */

		if (sdev->timeout < (45 * HZ))

			sdev->timeout = 45 * HZ;

		if (sdev->request_queue->rq_timeout < (45 * HZ))

			blk_queue_rq_timeout(sdev->request_queue, 45*HZ);

		for (cid = 0; cid < aac->maximum_num_containers; ++cid)

			if (aac->fsa_dev[cid].valid)

				++num_lsu;

CRA Git | Maintained and supported by SUSTech CRA and CCSE