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

Commit 103926c6 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: (27 commits)
  [SCSI] mpt fusion: don't oops if NumPhys==0
  [SCSI] iscsi class: regression - fix races with state manipulation and blocking/unblocking
  [SCSI] qla4xxx: regression - add start scan callout
  [SCSI] qla4xxx: fix host reset dpc race
  [SCSI] tgt: fix build errors when dprintk is defined
  [SCSI] tgt: set the data length properly
  [SCSI] tgt: stop zero'ing scsi_cmnd
  [SCSI] ibmvstgt: set up scsi_host properly before __scsi_alloc_queue
  [SCSI] docbook: fix fusion source files
  [SCSI] docbook: fix scsi source file
  [SCSI] qla2xxx: Update version number to 8.02.00-k9.
  [SCSI] qla2xxx: Correct usage of inconsistent timeout values while issuing ELS commands.
  [SCSI] qla2xxx: Correct discrepancies during OVERRUN handling on FWI2-capable cards.
  [SCSI] qla2xxx: Correct needless clean-up resets during shutdown.
  [SCSI] arcmsr: update version and changelog
  [SCSI] ps3rom: disable clustering
  [SCSI] ps3rom: fix wrong resid calculation bug
  [SCSI] mvsas: fix phy sas address
  [SCSI] gdth: fix to internal commands execution
  [SCSI] gdth: bugfix for the at-exit problems
  ...
parents da71aeb6 51f39eae

Documentation/scsi/ChangeLog.arcmsr

+6 −0
Original line number Diff line number Diff line
@@ -109,4 +109,10 @@ 
**						8.replace pci_alloc_consistent()/pci_free_consistent() with kmalloc()/kfree() in arcmsr_iop_message_xfer()

**						9. fix the release of dma memory for type B in arcmsr_free_ccb_pool()

**						10.fix the arcmsr_polling_hbb_ccbdone()

** 1.20.00.15	02/27/2008	Erich Chen & Nick Cheng

**						1.arcmsr_iop_message_xfer() is called from atomic context under the

**						queuecommand scsi_host_template handler. James Bottomley pointed out

**						that the current GFP_KERNEL|GFP_DMA flags are wrong: firstly we are in

**						atomic context, secondly this memory is not used for DMA.

**						Also removed some unneeded casts. Thanks to Daniel Drake <dsd@gentoo.org>

**************************************************************************

drivers/message/fusion/mptsas.c

+5 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,11 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info, 
	if (error)

		goto out_free_consistent;



	if (!buffer->NumPhys) {

		error = -ENODEV;

		goto out_free_consistent;

	}



	/* save config data */

	port_info->num_phys = buffer->NumPhys;

	port_info->phy_info = kcalloc(port_info->num_phys,

drivers/scsi/aic94xx/aic94xx.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ int asd_abort_task_set(struct domain_device *, u8 *lun); 
int  asd_clear_aca(struct domain_device *, u8 *lun);

int  asd_clear_task_set(struct domain_device *, u8 *lun);

int  asd_lu_reset(struct domain_device *, u8 *lun);

int  asd_I_T_nexus_reset(struct domain_device *dev);

int  asd_query_task(struct sas_task *);



/* ---------- Adapter and Port management ---------- */

drivers/scsi/aic94xx/aic94xx_hwi.h

+1 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ struct asd_ascb { 


	/* internally generated command */

	struct timer_list timer;

	struct completion completion;

	struct completion *completion;

	u8        tag_valid:1;

	__be16    tag;		  /* error recovery only */
@@ -294,7 +294,6 @@ static inline void asd_init_ascb(struct asd_ha_struct *asd_ha, 
	ascb->timer.function = NULL;

	init_timer(&ascb->timer);

	ascb->tc_index = -1;

	init_completion(&ascb->completion);

}



/* Must be called with the tc_index_lock held!

drivers/scsi/aic94xx/aic94xx_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = { 
	.lldd_abort_task_set	= asd_abort_task_set,

	.lldd_clear_aca		= asd_clear_aca,

	.lldd_clear_task_set	= asd_clear_task_set,

	.lldd_I_T_nexus_reset	= NULL,

	.lldd_I_T_nexus_reset	= asd_I_T_nexus_reset,

	.lldd_lu_reset		= asd_lu_reset,

	.lldd_query_task	= asd_query_task,