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

Read10/Write10 parameters

Browse Source 
LBA is uint32_t for read/write10

Also store the lba/numblocks arguments in the task structure for read10/write10
This makes it much easier to implement a fully async "read lots/write lots"
applications.
This commit is contained in:
Ronnie Sahlberg
2011-01-23 18:34:16 +11:00
parent 7b5ff1095c
commit ec08fe7a45
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/iscsi.h
+3 -3
View File
@@ -480,11 +480,11 @@ int iscsi_synchronizecache10_async(struct iscsi_context *iscsi, int lun,
int immed, iscsi_command_cb cb, int immed, iscsi_command_cb cb,
void *private_data); void *private_data);
int iscsi_read10_async(struct iscsi_context *iscsi, int lun, int lba, int iscsi_read10_async(struct iscsi_context *iscsi, int lun, uint32_t lba,
int datalen, int blocksize, iscsi_command_cb cb, uint32_t datalen, int blocksize, iscsi_command_cb cb,
void *private_data); void *private_data);
int iscsi_write10_async(struct iscsi_context *iscsi, int lun, int iscsi_write10_async(struct iscsi_context *iscsi, int lun,
unsigned char *data, int datalen, int lba, int fua, unsigned char *data, uint32_t datalen, uint32_t lba, int fua,
int fuanv, int blocksize, iscsi_command_cb cb, int fuanv, int blocksize, iscsi_command_cb cb,
void *private_data); void *private_data);
int iscsi_modesense6_async(struct iscsi_context *iscsi, int lun, int dbd, int iscsi_modesense6_async(struct iscsi_context *iscsi, int lun, int dbd,
include/scsi-lowlevel.h
+12 -2
View File
@@ -66,6 +66,14 @@ enum scsi_xfer_dir {
struct scsi_reportluns_params { struct scsi_reportluns_params {
int report_type; int report_type;
}; };
struct scsi_read10_params {
uint32_t lba;
uint32_t num_blocks;
};
struct scsi_write10_params {
uint32_t lba;
uint32_t num_blocks;
};
struct scsi_readcapacity10_params { struct scsi_readcapacity10_params {
int lba; int lba;
int pmi; int pmi;
@@ -105,6 +113,8 @@ struct scsi_task {
int expxferlen; int expxferlen;
unsigned char cdb[SCSI_CDB_MAX_SIZE]; unsigned char cdb[SCSI_CDB_MAX_SIZE];
union { union {
struct scsi_read10_params read10;
struct scsi_write10_params write10;
struct scsi_readcapacity10_params readcapacity10; struct scsi_readcapacity10_params readcapacity10;
struct scsi_reportluns_params reportluns; struct scsi_reportluns_params reportluns;
struct scsi_inquiry_params inquiry; struct scsi_inquiry_params inquiry;
@@ -361,8 +371,8 @@ struct scsi_task *scsi_cdb_modesense6(int dbd,
int scsi_datain_getfullsize(struct scsi_task *task); int scsi_datain_getfullsize(struct scsi_task *task);
void *scsi_datain_unmarshall(struct scsi_task *task); void *scsi_datain_unmarshall(struct scsi_task *task);
struct scsi_task *scsi_cdb_read10(int lba, int xferlen, int blocksize); struct scsi_task *scsi_cdb_read10(uint32_t lba, uint32_t xferlen, int blocksize);
struct scsi_task *scsi_cdb_write10(int lba, int xferlen, int fua, int fuanv, struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int fua, int fuanv,
int blocksize); int blocksize);
struct scsi_task *scsi_cdb_synchronizecache10(int lba, int num_blocks, struct scsi_task *scsi_cdb_synchronizecache10(int lba, int num_blocks,
lib/scsi-command.c
+3 -3
View File
@@ -569,8 +569,8 @@ iscsi_readcapacity10_async(struct iscsi_context *iscsi, int lun, int lba,
} }
int int
iscsi_read10_async(struct iscsi_context *iscsi, int lun, int lba, iscsi_read10_async(struct iscsi_context *iscsi, int lun, uint32_t lba,
int datalen, int blocksize, uint32_t datalen, int blocksize,
iscsi_command_cb cb, void *private_data) iscsi_command_cb cb, void *private_data)
{ {
struct scsi_task *task; struct scsi_task *task;
@@ -597,7 +597,7 @@ iscsi_read10_async(struct iscsi_context *iscsi, int lun, int lba,
int int
iscsi_write10_async(struct iscsi_context *iscsi, int lun, unsigned char *data, iscsi_write10_async(struct iscsi_context *iscsi, int lun, unsigned char *data,
int datalen, int lba, int fua, int fuanv, int blocksize, uint32_t datalen, uint32_t lba, int fua, int fuanv, int blocksize,
iscsi_command_cb cb, void *private_data) iscsi_command_cb cb, void *private_data)
{ {
struct scsi_task *task; struct scsi_task *task;
lib/scsi-lowlevel.c
+8 -2
View File
@@ -507,7 +507,7 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
* READ10 * READ10
*/ */
struct scsi_task * struct scsi_task *
scsi_cdb_read10(int lba, int xferlen, int blocksize) scsi_cdb_read10(uint32_t lba, uint32_t xferlen, int blocksize)
{ {
struct scsi_task *task; struct scsi_task *task;
@@ -526,6 +526,9 @@ scsi_cdb_read10(int lba, int xferlen, int blocksize)
task->xfer_dir = SCSI_XFER_READ; task->xfer_dir = SCSI_XFER_READ;
task->expxferlen = xferlen; task->expxferlen = xferlen;
task->params.read10.lba = lba;
task->params.read10.num_blocks = xferlen/blocksize;
return task; return task;
} }
@@ -533,7 +536,7 @@ scsi_cdb_read10(int lba, int xferlen, int blocksize)
* WRITE10 * WRITE10
*/ */
struct scsi_task * struct scsi_task *
scsi_cdb_write10(int lba, int xferlen, int fua, int fuanv, int blocksize) scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int fua, int fuanv, int blocksize)
{ {
struct scsi_task *task; struct scsi_task *task;
@@ -559,6 +562,9 @@ scsi_cdb_write10(int lba, int xferlen, int fua, int fuanv, int blocksize)
task->xfer_dir = SCSI_XFER_WRITE; task->xfer_dir = SCSI_XFER_WRITE;
task->expxferlen = xferlen; task->expxferlen = xferlen;
task->params.write10.lba = lba;
task->params.write10.num_blocks = xferlen/blocksize;
return task; return task;
} }