diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 17:49:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 17:49:59 -0800 |
| commit | 103926c689650396901002c3a8c38970fff70391 (patch) | |
| tree | db520fd02cc46c9afe1d6fa4389dbe5a2892a9f3 /include | |
| parent | da71aeb6149cf6c9c98b8ff2ce1c2ae93dbcfa75 (diff) | |
| parent | 51f39eae14b4874618e73281c236e3a1c1572d4d (diff) | |
| download | linux-3.10-103926c689650396901002c3a8c38970fff70391.tar.gz linux-3.10-103926c689650396901002c3a8c38970fff70391.tar.bz2 linux-3.10-103926c689650396901002c3a8c38970fff70391.zip | |
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
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/libsas.h | 1 | ||||
| -rw-r--r-- | include/scsi/scsi_transport_iscsi.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 3ffd6b582a9..39e1cac24bb 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -675,5 +675,6 @@ extern int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, extern void sas_ssp_task_response(struct device *dev, struct sas_task *task, struct ssp_response_iu *iu); +struct sas_phy *sas_find_local_phy(struct domain_device *dev); #endif /* _SASLIB_H_ */ diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index dbc96ef4cc7..aab1eae2ec4 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h @@ -177,6 +177,8 @@ struct iscsi_cls_session { struct list_head host_list; struct iscsi_transport *transport; spinlock_t lock; + struct work_struct block_work; + struct work_struct unblock_work; struct work_struct scan_work; struct work_struct unbind_work; |