d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi: change iscsi_bhs_scsi_req variable names.

Browse Source 
These variable names are changed to retain conformity with astyle 3.0.1. Astyle 3.0.1 recognizes 'final' as a keyword and incorrectly formats the iscsi_spec.h file breaking the build. Names were changed to avoid this case and maintain consistency within the struct.

Change-Id: I39c29d768c0ddfd459a9e9212c29cf564dad1963
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/369905
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2017-07-17 15:57:54 -07:00 committed by Daniel Verkamp
parent 32f86a5f34
commit f03f5e7de8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/spdk/iscsi_spec.h
View File

@ -310,9 +310,9 @@ struct iscsi_bhs_scsi_req {
uint8_t reserved : 1;
uint8_t attribute : 3;
uint8_t reserved2 : 2;
uint8_t write : 1;
uint8_t read : 1;
uint8_t final : 1;
uint8_t write_bit : 1;
uint8_t read_bit : 1;
uint8_t final_bit : 1;
uint8_t res[2];
uint8_t total_ahs_len;
uint8_t data_segment_len[3];

6
lib/iscsi/iscsi.c
View File

@ -2935,9 +2935,9 @@ spdk_iscsi_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu)
reqh = (struct iscsi_bhs_scsi_req *)&pdu->bhs;
F_bit = reqh->final;
R_bit = reqh->read;
W_bit = reqh->write;
F_bit = reqh->final_bit;
R_bit = reqh->read_bit;
W_bit = reqh->write_bit;
lun = from_be64(&reqh->lun);
task_tag = from_be32(&reqh->itt);
transfer_len = from_be32(&reqh->expected_data_xfer_len);

2
lib/iscsi/task.h
View File

@ -145,7 +145,7 @@ spdk_iscsi_task_is_read(struct spdk_iscsi_task *task)
struct iscsi_bhs_scsi_req *scsi_req;
scsi_req = (struct iscsi_bhs_scsi_req *)spdk_iscsi_task_get_bhs(task);
return (scsi_req->read == 1);
return (scsi_req->read_bit == 1);
}
static inline uint32_t

4
test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
View File

@ -145,8 +145,8 @@ maxburstlength_test(void)
to_be32(&req->cmd_sn, 0);
to_be32(&req->expected_data_xfer_len, 1028);
to_be32(&req->itt, 0x1234);
req->write = 1;
req->final = 1;
req->write_bit = 1;
req->final_bit = 1;
g_spdk_iscsi.MaxRecvDataSegmentLength = 1024;