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

slist.h: rename SLIST_ to ISCSI_LIST_ to avoid clash on *BSD

Browse Source 
Rename the macros for managing the linked lists from SLIST_* to ISCSI_LIST_*
to avoid a clash on *BSD which already have other macros SLIST_*

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2014-05-07 06:44:19 -07:00
parent fe669580ee
commit 717b95cb8a
8 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/socket.c
View File

@@ -578,7 +578,7 @@ iscsi_read_from_socket(struct iscsi_context *iscsi)
return 0;
}
SLIST_ADD_END(&iscsi->inqueue, in);
ISCSI_LIST_ADD_END(&iscsi->inqueue, in);
iscsi->incoming = NULL;
@@ -588,7 +588,7 @@ iscsi_read_from_socket(struct iscsi_context *iscsi)
if (iscsi_process_pdu(iscsi, current) != 0) {
return -1;
}
SLIST_REMOVE(&iscsi->inqueue, current);
ISCSI_LIST_REMOVE(&iscsi->inqueue, current);
iscsi_free_iscsi_in_pdu(iscsi, current);
}
@@ -617,13 +617,13 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
}
/* pop first element of the outqueue */
iscsi->outqueue_current = iscsi->outqueue;
SLIST_REMOVE(&iscsi->outqueue, iscsi->outqueue_current);
ISCSI_LIST_REMOVE(&iscsi->outqueue, iscsi->outqueue_current);
if (!(iscsi->outqueue_current->flags & ISCSI_PDU_DELETE_WHEN_SENT)) {
/* we have to add the pdu to the waitqueue already here
since the storage might sent a R2T as soon as it has
received the header. if we sent immediate data in a
cmd PDU the R2T might get lost otherwise. */
SLIST_ADD_END(&iscsi->waitpdu, iscsi->outqueue_current);
ISCSI_LIST_ADD_END(&iscsi->waitpdu, iscsi->outqueue_current);
}
}