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

Merge with upstream

Browse Source
This commit is contained in:
Jon Grimm
2012-10-25 12:56:26 -05:00
parent 1eaca70a52 9eb5b96a82
commit b81bdd3932
22 changed files with 1000 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scsi-lowlevel.c
+6 -6
View File
@@ -76,8 +76,8 @@ scsi_malloc(struct scsi_task *task, size_t size)
}
struct value_string {
int value;
const char *string;
int value;
const char *string;
};
static const char *
@@ -1399,7 +1399,7 @@ scsi_cdb_compareandwrite(uint64_t lba, uint32_t xferlen, int blocksize, int wrpr
task->xfer_dir = SCSI_XFER_WRITE;
} else {
task->xfer_dir = SCSI_XFER_NONE;
}
}
task->expxferlen = xferlen;
task->params.compareandwrite.lba = lba;
@@ -2508,9 +2508,9 @@ scsi_get_task_private_ptr(struct scsi_task *task)
struct scsi_data_buffer {
struct scsi_data_buffer *next;
uint32_t len;
unsigned char *data;
struct scsi_data_buffer *next;
uint32_t len;
unsigned char *data;
};
int