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

LD_ISCSI: Use readcapacity16 instead of readcapacity10

Browse Source 
This allows for handling volumes larger than 2TB
This commit is contained in:
Peter Lieven
2012-10-21 08:35:55 +02:00
parent 8a3e312f06
commit 08bfabcd36
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ld_iscsi.c
View File

@@ -65,7 +65,7 @@ int open(const char *path, int flags, mode_t mode)
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
struct iscsi_url *iscsi_url; struct iscsi_url *iscsi_url;
struct scsi_task *task; struct scsi_task *task;
struct scsi_readcapacity10 *rc10; struct scsi_readcapacity16 *rc16;
if (mode & O_NONBLOCK) { if (mode & O_NONBLOCK) {
LD_ISCSI_DPRINTF(0,"Non-blocking I/O is currently not supported"); LD_ISCSI_DPRINTF(0,"Non-blocking I/O is currently not supported");
@@ -109,7 +109,7 @@ int open(const char *path, int flags, mode_t mode)
return -1; return -1;
} }
task = iscsi_readcapacity10_sync(iscsi, iscsi_url->lun, 0, 0); task = iscsi_readcapacity16_sync(iscsi, iscsi_url->lun);
if (task == NULL || task->status != SCSI_STATUS_GOOD) { if (task == NULL || task->status != SCSI_STATUS_GOOD) {
LD_ISCSI_DPRINTF(0,"failed to send readcapacity command"); LD_ISCSI_DPRINTF(0,"failed to send readcapacity command");
iscsi_destroy_url(iscsi_url); iscsi_destroy_url(iscsi_url);
@@ -118,8 +118,8 @@ int open(const char *path, int flags, mode_t mode)
return -1; return -1;
} }
rc10 = scsi_datain_unmarshall(task); rc16 = scsi_datain_unmarshall(task);
if (rc10 == NULL) { if (rc16 == NULL) {
LD_ISCSI_DPRINTF(0,"failed to unmarshall readcapacity10 data"); LD_ISCSI_DPRINTF(0,"failed to unmarshall readcapacity10 data");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
iscsi_destroy_url(iscsi_url); iscsi_destroy_url(iscsi_url);
@@ -128,6 +128,8 @@ int open(const char *path, int flags, mode_t mode)
return -1; return -1;
} }
LD_ISCSI_DPRINTF(4,"readcapacity16_sync: block_size: %d, num_blocks: %lu",rc16->block_length,rc16->returned_lba + 1);
fd = iscsi_get_fd(iscsi); fd = iscsi_get_fd(iscsi);
if (fd >= ISCSI_MAX_FD) { if (fd >= ISCSI_MAX_FD) {
LD_ISCSI_DPRINTF(0,"Too many files open"); LD_ISCSI_DPRINTF(0,"Too many files open");
@@ -140,8 +142,8 @@ int open(const char *path, int flags, mode_t mode)
iscsi_fd_list[fd].is_iscsi = 1; iscsi_fd_list[fd].is_iscsi = 1;
iscsi_fd_list[fd].dup2fd = -1; iscsi_fd_list[fd].dup2fd = -1;
iscsi_fd_list[fd].iscsi = iscsi; iscsi_fd_list[fd].iscsi = iscsi;
iscsi_fd_list[fd].block_size = rc10->block_size; iscsi_fd_list[fd].block_size = rc16->block_length;
iscsi_fd_list[fd].num_blocks = rc10->lba + 1; iscsi_fd_list[fd].num_blocks = rc16->returned_lba + 1;
iscsi_fd_list[fd].offset = 0; iscsi_fd_list[fd].offset = 0;
iscsi_fd_list[fd].lun = iscsi_url->lun; iscsi_fd_list[fd].lun = iscsi_url->lun;
iscsi_fd_list[fd].mode = mode; iscsi_fd_list[fd].mode = mode;