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

Add tracking of MAXCMDSN

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-08-02 09:09:22 +10:00
parent 439f68e555
commit 71be26ad03
4 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/scsi-command.c
View File

@@ -324,15 +324,20 @@ int
iscsi_process_scsi_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
struct iscsi_in_pdu *in)
{
int statsn, flags, status;
uint32_t statsn, maxcmdsn, flags, status;
struct iscsi_scsi_cbdata *scsi_cbdata = pdu->scsi_cbdata;
struct scsi_task *task = scsi_cbdata->task;
statsn = ntohl(*(uint32_t *)&in->hdr[24]);
if (statsn > (int)iscsi->statsn) {
if (statsn > iscsi->statsn) {
iscsi->statsn = statsn;
}
maxcmdsn = ntohl(*(uint32_t *)&in->hdr[32]);
if (maxcmdsn > iscsi->maxcmdsn) {
iscsi->maxcmdsn = maxcmdsn;
}
flags = in->hdr[1];
if ((flags&ISCSI_PDU_DATA_FINAL) == 0) {
iscsi_set_error(iscsi, "scsi response pdu but Final bit is "
@@ -419,16 +424,21 @@ int
iscsi_process_scsi_data_in(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
struct iscsi_in_pdu *in, int *is_finished)
{
int statsn, flags, status;
uint32_t statsn, maxcmdsn, flags, status;
struct iscsi_scsi_cbdata *scsi_cbdata = pdu->scsi_cbdata;
struct scsi_task *task = scsi_cbdata->task;
int dsl;
statsn = ntohl(*(uint32_t *)&in->hdr[24]);
if (statsn > (int)iscsi->statsn) {
if (statsn > iscsi->statsn) {
iscsi->statsn = statsn;
}
maxcmdsn = ntohl(*(uint32_t *)&in->hdr[32]);
if (maxcmdsn > iscsi->maxcmdsn) {
iscsi->maxcmdsn = maxcmdsn;
}
flags = in->hdr[1];
if ((flags&ISCSI_PDU_DATA_ACK_REQUESTED) != 0) {
iscsi_set_error(iscsi, "scsi response asked for ACK "
@@ -497,12 +507,17 @@ int
iscsi_process_r2t(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
struct iscsi_in_pdu *in)
{
uint32_t ttt, offset, len;
uint32_t ttt, offset, len, maxcmdsn;
ttt = ntohl(*(uint32_t *)&in->hdr[20]);
offset = ntohl(*(uint32_t *)&in->hdr[40]);
len = ntohl(*(uint32_t *)&in->hdr[44]);
maxcmdsn = ntohl(*(uint32_t *)&in->hdr[32]);
if (maxcmdsn > iscsi->maxcmdsn) {
iscsi->maxcmdsn = maxcmdsn;
}
pdu->datasn = 0;
iscsi_send_data_out(iscsi, pdu, ttt, offset, len);
return 0;