warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: rename pdu->written -> pdu->outdata_written

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-08-04 17:27:29 -07:00
parent c5bd95aac9
commit 6cb88eb0ce
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/iscsi-private.h
+2 -2
View File
@@ -221,9 +221,9 @@ struct iscsi_pdu {
iscsi_command_cb callback; iscsi_command_cb callback;
void *private_data; void *private_data;
int written;
struct iscsi_data outdata; /* Header for PDU to send */ struct iscsi_data outdata; /* Header for PDU to send */
size_t outdata_written; /* How much of the header we have written */
uint32_t out_offset; /* Offset into data-out iovector */ uint32_t out_offset; /* Offset into data-out iovector */
uint32_t out_len; /* Amount of data to sent starting at out_offset */ uint32_t out_len; /* Amount of data to sent starting at out_offset */
uint32_t out_written; /* Number of bytes written to socket */ uint32_t out_written; /* Number of bytes written to socket */
lib/connect.c
+1 -1
View File
@@ -343,7 +343,7 @@ try_again:
iscsi_pdu_set_expstatsn(pdu, iscsi->statsn); iscsi_pdu_set_expstatsn(pdu, iscsi->statsn);
iscsi->statsn++; iscsi->statsn++;
pdu->written = 0; pdu->outdata_written = 0;
pdu->out_written = 0; pdu->out_written = 0;
iscsi_add_to_outqueue(iscsi, pdu); iscsi_add_to_outqueue(iscsi, pdu);
} }
lib/socket.c
+6 -10
View File
@@ -596,8 +596,6 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
} }
while (iscsi->outqueue != NULL || iscsi->outqueue_current != NULL) { while (iscsi->outqueue != NULL || iscsi->outqueue_current != NULL) {
ssize_t total;
if (iscsi->outqueue_current == NULL) { if (iscsi->outqueue_current == NULL) {
if (iscsi_serial32_compare(iscsi->outqueue->cmdsn, iscsi->maxcmdsn) > 0) { if (iscsi_serial32_compare(iscsi->outqueue->cmdsn, iscsi->maxcmdsn) > 0) {
/* stop sending. maxcmdsn is reached */ /* stop sending. maxcmdsn is reached */
@@ -616,15 +614,13 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
} }
pdu = iscsi->outqueue_current; pdu = iscsi->outqueue_current;
pdu->outdata.size = (pdu->outdata.size + 3) & 0xfffffffc;
total = pdu->outdata.size;
total = (total + 3) & 0xfffffffc;
/* Write header and any immediate data */ /* Write header and any immediate data */
if (pdu->written < total) { if (pdu->outdata_written < pdu->outdata.size) {
count = send(iscsi->fd, count = send(iscsi->fd,
pdu->outdata.data + pdu->written, pdu->outdata.data + pdu->outdata_written,
total - pdu->written, pdu->outdata.size - pdu->outdata_written,
0); 0);
if (count == -1) { if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
@@ -634,10 +630,10 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
"socket :%d", errno); "socket :%d", errno);
return -1; return -1;
} }
pdu->written += count; pdu->outdata_written += count;
} }
/* if we havent written the full header yet. */ /* if we havent written the full header yet. */
if (pdu->written != total) { if (pdu->outdata_written != pdu->outdata.size) {
return 0; return 0;
} }