diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 21:47:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 21:47:44 +0100 |
| commit | 26d451b603e754ded83f0e5becab2a78253ad100 (patch) | |
| tree | 99209544823dbdb5735ae5f7234c83beea2f6a22 /drivers/scsi/iscsi_tcp.h | |
| parent | [PATCH] Fix over-zealous tag clearing in radix_tree_delete (diff) | |
| parent | [SCSI] fix wrong context bugs in SCSI (diff) | |
| download | linux-26d451b603e754ded83f0e5becab2a78253ad100.tar.xz linux-26d451b603e754ded83f0e5becab2a78253ad100.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/iscsi_tcp.h')
| -rw-r--r-- | drivers/scsi/iscsi_tcp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h index f95e61b76f70..ba26741ac154 100644 --- a/drivers/scsi/iscsi_tcp.h +++ b/drivers/scsi/iscsi_tcp.h @@ -113,7 +113,10 @@ struct iscsi_tcp_recv { int datadgst; }; +struct iscsi_cls_conn; + struct iscsi_conn { + struct iscsi_cls_conn *cls_conn; /* ptr to class connection */ struct iscsi_hdr hdr; /* header placeholder */ char hdrext[4*sizeof(__u16) + sizeof(__u32)]; @@ -143,7 +146,6 @@ struct iscsi_conn { struct iscsi_mgmt_task *login_mtask; /* mtask used for login/text */ struct iscsi_mgmt_task *mtask; /* xmit mtask in progress */ struct iscsi_cmd_task *ctask; /* xmit ctask in progress */ - spinlock_t lock; /* FIXME: to be removed */ /* old values for socket callbacks */ void (*old_data_ready)(struct sock *, int); |