diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 07:46:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 07:46:09 -0700 |
commit | cabe456902e709095ebf1481342ea89910887d60 (patch) | |
tree | c906ff1a07786fa09d203acbc7b9023a981be121 /include | |
parent | 0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01 (diff) | |
parent | 6724add1b5cfb020ba8f5532efe430d1ccd5fc30 (diff) | |
download | linux-cabe456902e709095ebf1481342ea89910887d60.tar.gz linux-cabe456902e709095ebf1481342ea89910887d60.tar.bz2 linux-cabe456902e709095ebf1481342ea89910887d60.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] libiscsi: sync up iscsi and scsi eh's access to the connection
[SCSI] libiscsi: fix null ptr regression when aborting a command with data to transfer
[SCSI] qla2xxx: Update version number to 8.02.00-k3.
[SCSI] qla2xxx: Correct mailbox register dump for FWI2 capable ISPs.
[SCSI] qla2xxx: Correct 8GB iIDMA support.
[SCSI] qla2xxx: Correct management-server login-state synchronization issue.
[SCSI] qla2xxx: Don't modify parity bits during ISP25XX restart.
[SCSI] qla2xxx: Allocate enough space for the full PCI descriptor.
[SCSI] zfcp: fix the data buffer accessor patch
[SCSI] zfcp: allocate gid_pn_data objects from gid_pn_cache
[SCSI] zfcp: fix memory leak
Diffstat (limited to 'include')
-rw-r--r-- | include/scsi/libiscsi.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 007d442412e2..b4b31132618b 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -205,6 +205,13 @@ struct iscsi_queue { }; struct iscsi_session { + /* + * Syncs up the scsi eh thread with the iscsi eh thread when sending + * task management functions. This must be taken before the session + * and recv lock. + */ + struct mutex eh_mutex; + /* iSCSI session-wide sequencing */ uint32_t cmdsn; uint32_t exp_cmdsn; |