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

SCSI: remove LBDATA/PBDATA from the WriteSame10/16 signatures

Browse Source 
Make LBA the third argument to the iscsi writesame functions
This commit is contained in:
Ronnie Sahlberg
2013-01-21 21:15:37 -08:00
parent 9bf6a3d68b
commit 0f73f062d2
18 changed files with 170 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/iscsi.h
View File

@@ -750,18 +750,16 @@ iscsi_verify16_task(struct iscsi_context *iscsi, int lun,
int blocksize, iscsi_command_cb cb,
void *private_data);
EXTERN struct scsi_task *
iscsi_writesame10_task(struct iscsi_context *iscsi, int lun,
iscsi_writesame10_task(struct iscsi_context *iscsi, int lun, uint32_t lba,
unsigned char *data, uint32_t datalen,
uint32_t lba, uint16_t num_blocks,
int anchor, int unmap, int pbdata, int lbdata,
int wrprotect, int group,
uint16_t num_blocks,
int anchor, int unmap, int wrprotect, int group,
iscsi_command_cb cb, void *private_data);
EXTERN struct scsi_task *
iscsi_writesame16_task(struct iscsi_context *iscsi, int lun,
iscsi_writesame16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen,
uint64_t lba, uint32_t num_blocks,
int anchor, int unmap, int pbdata, int lbdata,
int wrprotect, int group,
uint32_t num_blocks,
int anchor, int unmap, int wrprotect, int group,
iscsi_command_cb cb, void *private_data);
EXTERN struct scsi_task *
iscsi_modesense6_task(struct iscsi_context *iscsi, int lun, int dbd,
@@ -943,18 +941,16 @@ iscsi_verify16_sync(struct iscsi_context *iscsi, int lun,
int blocksize);
EXTERN struct scsi_task *
iscsi_writesame10_sync(struct iscsi_context *iscsi, int lun,
iscsi_writesame10_sync(struct iscsi_context *iscsi, int lun, uint32_t lba,
unsigned char *data, uint32_t datalen,
uint32_t lba, uint16_t num_blocks,
int anchor, int unmap, int pbdata, int lbdata,
int wrprotect, int group);
uint16_t num_blocks,
int anchor, int unmap, int wrprotect, int group);
EXTERN struct scsi_task *
iscsi_writesame16_sync(struct iscsi_context *iscsi, int lun,
iscsi_writesame16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
unsigned char *data, uint32_t datalen,
uint64_t lba, uint32_t num_blocks,
int anchor, int unmap, int pbdata, int lbdata,
int wrprotect, int group);
uint32_t num_blocks,
int anchor, int unmap, int wrprotect, int group);
EXTERN struct scsi_task *
iscsi_persistent_reserve_in_sync(struct iscsi_context *iscsi, int lun,

4
include/scsi-lowlevel.h
View File

@@ -792,8 +792,8 @@ EXTERN struct scsi_task *scsi_cdb_get_lba_status(uint64_t starting_lba, uint32_t
EXTERN struct scsi_task *scsi_cdb_unmap(int anchor, int group, uint16_t xferlen);
EXTERN struct scsi_task *scsi_cdb_persistent_reserve_in(enum scsi_persistent_in_sa sa, uint16_t xferlen);
EXTERN struct scsi_task *scsi_cdb_persistent_reserve_out(enum scsi_persistent_out_sa sa, enum scsi_persistent_out_scope scope, enum scsi_persistent_out_type type, void *params);
EXTERN struct scsi_task *scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint32_t lba, int group, uint16_t num_blocks);
EXTERN struct scsi_task *scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, int pbdata, int lbdata, uint64_t lba, int group, uint32_t num_blocks);
EXTERN struct scsi_task *scsi_cdb_writesame10(int wrprotect, int anchor, int unmap, uint32_t lba, int group, uint16_t num_blocks);
EXTERN struct scsi_task *scsi_cdb_writesame16(int wrprotect, int anchor, int unmap, uint64_t lba, int group, uint32_t num_blocks);
EXTERN struct scsi_task *scsi_cdb_prefetch10(uint32_t lba, int num_blocks, int immed, int group);
EXTERN struct scsi_task *scsi_cdb_prefetch16(uint64_t lba, int num_blocks, int immed, int group);
EXTERN struct scsi_task *scsi_cdb_report_supported_opcodes(int report_timeouts, uint32_t alloc_len);