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

Commit 85cb7f12 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] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
  [SCSI] qla2xxx: Update version number to 8.03.05-k0.
  [SCSI] qla2xxx: Properly set the return value in qla2xxx_eh_abort function.
  [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
  [SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.
  [SCSI] qla2xxx: Populate Command Type 6 LUN field properly.
  [SCSI] zfcp: Issue FCP command without holding SCSI host_lock
  [SCSI] zfcp: Prevent usage w/o holding a reference
  [SCSI] zfcp: No ERP escalation on gpn_ft eval
  [SCSI] zfcp: Correct false abort data assignment.
  [SCSI] zfcp: Fix common FCP request reception
  [SCSI] Eliminate error handler overload of the SCSI serial number
  [SCSI] pmcraid: disable msix and expand device config entry
  [SCSI] bsg: correct fault if queue object removed while dev_t open
  [SCSI] osd: checking NULL instead of ERR_PTR()
parents 3373c3dd 7c03b870

block/bsg.c

+8 −0
Original line number Diff line number Diff line
@@ -250,6 +250,14 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm, 
	int ret, rw;

	unsigned int dxfer_len;

	void *dxferp = NULL;

	struct bsg_class_device *bcd = &q->bsg_dev;



	/* if the LLD has been removed then the bsg_unregister_queue will

	 * eventually be called and the class_dev was freed, so we can no

	 * longer use this request_queue. Return no such address.

	 */

	if (!bcd->class_dev)

		return ERR_PTR(-ENXIO);



	dprintk("map hdr %llx/%u %llx/%u\n", (unsigned long long) hdr->dout_xferp,

		hdr->dout_xfer_len, (unsigned long long) hdr->din_xferp,

drivers/s390/scsi/zfcp_erp.c

+8 −3
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter, 
		if (!(a_status & ZFCP_STATUS_COMMON_RUNNING) ||

		      a_status & ZFCP_STATUS_COMMON_ERP_FAILED)

			return 0;

		if (p_status & ZFCP_STATUS_COMMON_NOESC)

			return need;

		if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;

		/* fall through */
@@ -188,6 +190,9 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		atomic_set_mask(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;

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

		      ZFCP_STATUS_COMMON_RUNNING))

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

		atomic_set_mask(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;

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

			act_status |= ZFCP_STATUS_ERP_CLOSE_ONLY;

		break;
@@ -209,6 +216,7 @@ static struct zfcp_erp_action *zfcp_erp_setup_act(int need, u32 act_status, 
		zfcp_erp_action_dismiss_adapter(adapter);

		atomic_set_mask(ZFCP_STATUS_COMMON_ERP_INUSE, &adapter->status);

		erp_action = &adapter->erp_action;

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

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

		      ZFCP_STATUS_COMMON_RUNNING))

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

	}



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

	erp_action->adapter = adapter;

	erp_action->port = port;

	erp_action->sdev = sdev;

	erp_action->action = need;

	erp_action->status = act_status;

drivers/s390/scsi/zfcp_fsf.c

+6 −5
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *scmnd) 


	zfcp_qdio_set_sbale_last(qdio, &req->qdio_req);



	req->data = zfcp_sdev;

	req->data = sdev;

	req->handler = zfcp_fsf_abort_fcp_command_handler;

	req->qtcb->header.lun_handle = zfcp_sdev->lun_handle;

	req->qtcb->header.port_handle = zfcp_sdev->port->handle;
@@ -2069,8 +2069,6 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req) 
	struct fcp_resp_with_ext *fcp_rsp;

	unsigned long flags;



	zfcp_fsf_fcp_handler_common(req);



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



	scpnt = req->data;
@@ -2079,6 +2077,8 @@ static void zfcp_fsf_fcp_cmnd_handler(struct zfcp_fsf_req *req) 
		return;

	}



	zfcp_fsf_fcp_handler_common(req);



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

		set_host_byte(scpnt, DID_TRANSPORT_DISRUPTED);

		goto skip_fsfstatus;
@@ -2170,12 +2170,13 @@ int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *scsi_cmnd) 
	struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;

	struct zfcp_qdio *qdio = adapter->qdio;

	struct fsf_qtcb_bottom_io *io;

	unsigned long flags;



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

		       ZFCP_STATUS_COMMON_UNBLOCKED)))

		return -EBUSY;



	spin_lock(&qdio->req_q_lock);

	spin_lock_irqsave(&qdio->req_q_lock, flags);

	if (atomic_read(&qdio->req_q_free) <= 0) {

		atomic_inc(&qdio->req_q_full);

		goto out;
@@ -2239,7 +2240,7 @@ failed_scsi_cmnd: 
	zfcp_fsf_req_free(req);

	scsi_cmnd->host_scribble = NULL;

out:

	spin_unlock(&qdio->req_q_lock);

	spin_unlock_irqrestore(&qdio->req_q_lock, flags);

	return retval;

}

drivers/s390/scsi/zfcp_scsi.c

+2 −5
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result) 
	scpnt->scsi_done(scpnt);

}



static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt,

				  void (*done) (struct scsi_cmnd *))

static

int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt)

{

	struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scpnt->device);

	struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
@@ -87,7 +87,6 @@ static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt, 
	/* reset the status for this request */

	scpnt->result = 0;

	scpnt->host_scribble = NULL;

	scpnt->scsi_done = done;



	scsi_result = fc_remote_port_chkready(rport);

	if (unlikely(scsi_result)) {
@@ -127,8 +126,6 @@ static int zfcp_scsi_queuecommand_lck(struct scsi_cmnd *scpnt, 
	return ret;

}



static DEF_SCSI_QCMD(zfcp_scsi_queuecommand)



static int zfcp_scsi_slave_alloc(struct scsi_device *sdev)

{

	struct fc_rport *rport = starget_to_rport(scsi_target(sdev));

drivers/scsi/hpsa.c

+1 −7
Original line number Diff line number Diff line
@@ -90,12 +90,8 @@ static const struct pci_device_id hpsa_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3252},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3253},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3254},

#define PCI_DEVICE_ID_HP_CISSF 0x333f

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x333F},

	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},

	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,             PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},

	{0,}

};
@@ -113,8 +109,6 @@ static struct board_type products[] = { 
	{0x3249103C, "Smart Array P812", &SA5_access},

	{0x324a103C, "Smart Array P712m", &SA5_access},

	{0x324b103C, "Smart Array P711m", &SA5_access},

	{0x3233103C, "StorageWorks P1210m", &SA5_access},

	{0x333F103C, "StorageWorks P1210m", &SA5_access},

	{0x3250103C, "Smart Array", &SA5_access},

	{0x3250113C, "Smart Array", &SA5_access},

	{0x3250123C, "Smart Array", &SA5_access},