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

Add a function to cancel a scsi task from libiscsi.

Browse Source
This commit is contained in:
Ronnie Sahlberg
2011-09-19 21:21:40 +10:00
parent a974e8efe1
commit 3c11c3598b
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/iscsi.h
View File

@@ -656,5 +656,16 @@ iscsi_synchronizecache10_sync(struct iscsi_context *iscsi, int lun, int lba,
*/
EXTERN int scsi_task_add_data_in_buffer(struct scsi_task *task, int len, unsigned char *buf);
/*
* This function is used when you want to cancel a iscsi task.
* The task will be immeidately cancelled and the callback for the task will
* never be invoked.
* The cancellation is only local in libiscsi. If the tast is already in-flight
* this call will not cancel the task at the target.
* To cancel the task also a the target you need to call the task management functions.
*/
EXTERN int
iscsi_scsi_task_cancel(struct iscsi_context *iscsi,
struct scsi_task *task);
#endif /* __iscsi_h__ */

1
lib/libiscsi.def
View File

@@ -56,6 +56,7 @@ iscsi_readcapacity10_sync
iscsi_synchronizecache10_sync
iscsi_read6_sync
iscsi_read10_sync
iscsi_task_cancel
poll
scsi_task_add_data_in_buffer
scsi_sense_key_str

31
lib/scsi-lowlevel.c
View File

@@ -1130,3 +1130,34 @@ scsi_task_get_data_in_buffer(struct scsi_task *task, uint32_t pos, ssize_t *coun
return &sdb->data[pos];
}
int
iscsi_scsi_task_cancel(struct iscsi_context *iscsi,
struct scsi_task *task)
{
struct iscsi_pdu *pdu;
for (pdu = iscsi->waitpdu; pdu; pdu = pdu->next) {
if (pdu->itt == task->itt) {
while(task->in_buffers != NULL) {
struct scsi_data_buffer *ptr = task->in_buffers;
SLIST_REMOVE(&task->in_buffers, ptr);
}
SLIST_REMOVE(&iscsi->waitpdu, pdu);
iscsi_free_pdu(iscsi, pdu);
return 0;
}
}
for (pdu = iscsi->outqueue; pdu; pdu = pdu->next) {
if (pdu->itt == task->itt) {
while(task->in_buffers != NULL) {
struct scsi_data_buffer *ptr = task->in_buffers;
SLIST_REMOVE(&task->in_buffers, ptr);
}
SLIST_REMOVE(&iscsi->outqueue, pdu);
iscsi_free_pdu(iscsi, pdu);
return 0;
}
}
return -1;
}