Mercurial > illumos > illumos-gate
changeset 10044:2643c1cd9e2a
6855027 iscsit.d breaks dtrace in osol based on snv_117
| author | Priya Krishnan <Priya.Krishnan@Sun.COM> |
|---|---|
| date | Mon, 06 Jul 2009 21:19:41 -0400 |
| parents | 397682150a87 |
| children | 5e116862436f |
| files | usr/src/cmd/iscsi/iscsitgtd/iscsi.d usr/src/lib/libdtrace/common/iscsit.d usr/src/lib/libdtrace/common/scsi.d |
| diffstat | 3 files changed, 27 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/iscsi/iscsitgtd/iscsi.d Mon Jul 06 17:16:19 2009 -0700 +++ b/usr/src/cmd/iscsi/iscsitgtd/iscsi.d Mon Jul 06 21:19:41 2009 -0400 @@ -26,26 +26,7 @@ #pragma D depends_on library net.d #pragma D depends_on module genunix - -typedef struct iscsiinfo { - string ii_target; /* target iqn */ - string ii_initiator; /* initiator iqn */ - string ii_isid; /* initiator session identifier */ - string ii_tsih; /* target session identifying handle */ - string ii_transport; /* transport type ("iser-ib", "sockets") */ - - uint64_t ii_lun; /* target logical unit number */ - - uint32_t ii_itt; /* initiator task tag */ - uint32_t ii_ttt; /* target transfer tag */ - - uint32_t ii_cmdsn; /* command sequence number */ - uint32_t ii_statsn; /* status sequence number */ - uint32_t ii_datasn; /* data sequence number */ - - uint32_t ii_datalen; /* length of data payload */ - uint32_t ii_flags; /* probe-specific flags */ -} iscsiinfo_t; +#pragma D depends_on library scsi.d typedef struct uiscsiproto uiscsiproto_t;
--- a/usr/src/lib/libdtrace/common/iscsit.d Mon Jul 06 17:16:19 2009 -0700 +++ b/usr/src/lib/libdtrace/common/iscsit.d Mon Jul 06 21:19:41 2009 -0400 @@ -26,8 +26,7 @@ #pragma D depends_on library ip.d #pragma D depends_on library net.d /* conninfo_t */ -#pragma D depends_on library scsi.d /* scsicmd_t */ -#pragma D depends_on library iscsi.d /* iscsiinfo_t */ +#pragma D depends_on library scsi.d /* scsicmd_t and iscsiinfo_t */ #pragma D depends_on module genunix #pragma D depends_on module iscsit #pragma D depends_on module idm
--- a/usr/src/lib/libdtrace/common/scsi.d Mon Jul 06 17:16:19 2009 -0700 +++ b/usr/src/lib/libdtrace/common/scsi.d Mon Jul 06 21:19:41 2009 -0400 @@ -62,3 +62,28 @@ uint32_t xfer_len; /* transfer length */ uint32_t xfer_type; /* Read (0) or Write (1) */ } xferinfo_t; + +/* + * the iscsiinfo_t is used to provide identifying information about + * the target and the initiator and also some PDU level information + * such as lun, data length and sequence numbers. + */ +typedef struct iscsiinfo { + string ii_target; /* target iqn */ + string ii_initiator; /* initiator iqn */ + string ii_isid; /* initiator session identifier */ + string ii_tsih; /* target session identifying handle */ + string ii_transport; /* transport type ("iser-ib", "sockets") */ + + uint64_t ii_lun; /* target logical unit number */ + + uint32_t ii_itt; /* initiator task tag */ + uint32_t ii_ttt; /* target transfer tag */ + + uint32_t ii_cmdsn; /* command sequence number */ + uint32_t ii_statsn; /* status sequence number */ + uint32_t ii_datasn; /* data sequence number */ + + uint32_t ii_datalen; /* length of data payload */ + uint32_t ii_flags; /* probe-specific flags */ +} iscsiinfo_t;