iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
struct scsi_lun is also just a struct with an array of 8 octets (64 bits) but using it instead in iscsi structs lets us call scsilun_to_int without a cast, and also lets us copy it using assignment, instead of memcpy(). Signed-off-by: Andy Grover <agrover@redhat.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:

committed by
Nicholas Bellinger

parent
123521830c
commit
55bdabdf41
@@ -60,7 +60,7 @@ struct iscsi_hdr {
|
||||
uint8_t rsvd2[2];
|
||||
uint8_t hlength; /* AHSs total length */
|
||||
uint8_t dlength[3]; /* Data length */
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag, opaque for target */
|
||||
__be32 ttt; /* Target Task Tag */
|
||||
__be32 statsn;
|
||||
@@ -122,7 +122,7 @@ struct iscsi_scsi_req {
|
||||
__be16 rsvd2;
|
||||
uint8_t hlength;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag */
|
||||
__be32 data_length;
|
||||
__be32 cmdsn;
|
||||
@@ -198,7 +198,7 @@ struct iscsi_async {
|
||||
uint8_t rsvd2[2];
|
||||
uint8_t rsvd3;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
uint8_t rsvd4[8];
|
||||
__be32 statsn;
|
||||
__be32 exp_cmdsn;
|
||||
@@ -226,7 +226,7 @@ struct iscsi_nopout {
|
||||
__be16 rsvd2;
|
||||
uint8_t rsvd3;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag */
|
||||
__be32 ttt; /* Target Transfer Tag */
|
||||
__be32 cmdsn;
|
||||
@@ -241,7 +241,7 @@ struct iscsi_nopin {
|
||||
__be16 rsvd2;
|
||||
uint8_t rsvd3;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag */
|
||||
__be32 ttt; /* Target Transfer Tag */
|
||||
__be32 statsn;
|
||||
@@ -257,7 +257,7 @@ struct iscsi_tm {
|
||||
uint8_t rsvd1[2];
|
||||
uint8_t hlength;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag */
|
||||
itt_t rtt; /* Reference Task Tag */
|
||||
__be32 cmdsn;
|
||||
@@ -315,7 +315,7 @@ struct iscsi_r2t_rsp {
|
||||
uint8_t rsvd2[2];
|
||||
uint8_t hlength;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt; /* Initiator Task Tag */
|
||||
__be32 ttt; /* Target Transfer Tag */
|
||||
__be32 statsn;
|
||||
@@ -333,7 +333,7 @@ struct iscsi_data {
|
||||
uint8_t rsvd2[2];
|
||||
uint8_t rsvd3;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt;
|
||||
__be32 ttt;
|
||||
__be32 rsvd4;
|
||||
@@ -353,7 +353,7 @@ struct iscsi_data_rsp {
|
||||
uint8_t cmd_status;
|
||||
uint8_t hlength;
|
||||
uint8_t dlength[3];
|
||||
uint8_t lun[8];
|
||||
struct scsi_lun lun;
|
||||
itt_t itt;
|
||||
__be32 ttt;
|
||||
__be32 statsn;
|
||||
|
Reference in New Issue
Block a user