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

Add back iscsi_queue_pdu

Browse Source 
We need a public symbol for iscsi_queue_pdu. This is now just a
simple wrapper around iscsi->t->queue_pdu

https://github.com/sahlberg/libiscsi/issues/212

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2016-07-11 18:37:25 -07:00
parent f639f858eb
commit 37507c994a
9 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/iscsi-private.h
View File

@@ -295,7 +295,7 @@ void iscsi_pdu_set_datasn(struct iscsi_pdu *pdu, uint32_t datasn);
void iscsi_pdu_set_bufferoffset(struct iscsi_pdu *pdu, uint32_t bufferoffset); void iscsi_pdu_set_bufferoffset(struct iscsi_pdu *pdu, uint32_t bufferoffset);
int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, int iscsi_pdu_add_data(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
unsigned char *dptr, int dsize); unsigned char *dptr, int dsize);
int iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
int iscsi_add_data(struct iscsi_context *iscsi, struct iscsi_data *data, int iscsi_add_data(struct iscsi_context *iscsi, struct iscsi_data *data,
unsigned char *dptr, int dsize, int pdualignment); unsigned char *dptr, int dsize, int pdualignment);

2
lib/discovery.c
View File

@@ -80,7 +80,7 @@ iscsi_discovery_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
pdu->callback = cb; pdu->callback = cb;
pdu->private_data = private_data; pdu->private_data = private_data;
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
"text pdu."); "text pdu.");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);

4
lib/iscsi-command.c
View File

@@ -129,7 +129,7 @@ iscsi_send_data_out(struct iscsi_context *iscsi, struct iscsi_pdu *cmd_pdu,
/* update data segment length */ /* update data segment length */
scsi_set_uint32(&pdu->outdata.data[4], pdu->payload_len); scsi_set_uint32(&pdu->outdata.data[4], pdu->payload_len);
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
"scsi pdu."); "scsi pdu.");
goto error; goto error;
@@ -280,7 +280,7 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
pdu->callback = iscsi_scsi_response_cb; pdu->callback = iscsi_scsi_response_cb;
pdu->private_data = &pdu->scsi_cbdata; pdu->private_data = &pdu->scsi_cbdata;
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
"scsi pdu."); "scsi pdu.");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);

1
lib/libiscsi.def
View File

@@ -48,6 +48,7 @@ iscsi_preventallow_sync
iscsi_preventallow_task iscsi_preventallow_task
iscsi_queue_length iscsi_queue_length
iscsi_out_queue_length iscsi_out_queue_length
iscsi_queue_pdu
iscsi_read10_sync iscsi_read10_sync
iscsi_read10_iov_sync iscsi_read10_iov_sync
iscsi_read10_task iscsi_read10_task

1
lib/libiscsi.syms
View File

@@ -46,6 +46,7 @@ iscsi_preventallow_sync
iscsi_preventallow_task iscsi_preventallow_task
iscsi_queue_length iscsi_queue_length
iscsi_out_queue_length iscsi_out_queue_length
iscsi_queue_pdu
iscsi_read10_sync iscsi_read10_sync
iscsi_read10_iov_sync iscsi_read10_iov_sync
iscsi_read10_task iscsi_read10_task

4
lib/login.c
View File

@@ -1002,7 +1002,7 @@ iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
pdu->callback = cb; pdu->callback = cb;
pdu->private_data = private_data; pdu->private_data = private_data;
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
"pdu."); "pdu.");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);
@@ -1319,7 +1319,7 @@ iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
pdu->callback = cb; pdu->callback = cb;
pdu->private_data = private_data; pdu->private_data = private_data;
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi " iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
"logout pdu."); "logout pdu.");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);

4
lib/nop.c
View File

@@ -78,7 +78,7 @@ iscsi_nop_out_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
} }
} }
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "failed to queue iscsi nop-out pdu"); iscsi_set_error(iscsi, "failed to queue iscsi nop-out pdu");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);
return -1; return -1;
@@ -122,7 +122,7 @@ iscsi_send_target_nop_out(struct iscsi_context *iscsi, uint32_t ttt, uint32_t lu
/* cmdsn is not increased if Immediate delivery*/ /* cmdsn is not increased if Immediate delivery*/
iscsi_pdu_set_cmdsn(pdu, iscsi->cmdsn); iscsi_pdu_set_cmdsn(pdu, iscsi->cmdsn);
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "failed to queue iscsi nop-out pdu"); iscsi_set_error(iscsi, "failed to queue iscsi nop-out pdu");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);
return -1; return -1;

6
lib/pdu.c
View File

@@ -743,3 +743,9 @@ iscsi_timeout_scan(struct iscsi_context *iscsi)
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);
} }
} }
int
iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{
return iscsi->t->queue_pdu(iscsi, pdu);
}

2
lib/task_mgmt.c
View File

@@ -81,7 +81,7 @@ iscsi_task_mgmt_async(struct iscsi_context *iscsi,
pdu->callback = cb; pdu->callback = cb;
pdu->private_data = private_data; pdu->private_data = private_data;
if (iscsi->t->queue_pdu(iscsi, pdu) != 0) { if (iscsi_queue_pdu(iscsi, pdu) != 0) {
iscsi_set_error(iscsi, "failed to queue iscsi taskmgmt pdu"); iscsi_set_error(iscsi, "failed to queue iscsi taskmgmt pdu");
iscsi->t->free_pdu(iscsi, pdu); iscsi->t->free_pdu(iscsi, pdu);
return -1; return -1;