mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_vdisk: 32-bit build fix (merge r5629 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5632 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-06-29 05:18:01 +00:00
parent e585dbc244
commit f4bebb557a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -6022,7 +6022,7 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
char *params, const char *const allowed_params[])
{
int res = 0;
unsigned long val;
unsigned long long val;
char *param, *p, *pp;
TRACE_ENTRY();
@@ -6100,9 +6100,9 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
res = kstrtoul(pp, 0, &val);
res = kstrtoull(pp, 0, &val);
#else
res = strict_strtoul(pp, 0, &val);
res = strict_strtoull(pp, 0, &val);
#endif
if (res != 0) {
PRINT_ERROR("strtoul() for %s failed: %d (device %s)",
@@ -6144,7 +6144,7 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
} else if (!strcasecmp("tst", p)) {
if ((val != SCST_TST_0_SINGLE_TASK_SET) &&
(val != SCST_TST_1_SEP_TASK_SETS)) {
PRINT_ERROR("Invalid TST value %d", (int)val);
PRINT_ERROR("Invalid TST value %lld", val);
res = -EINVAL;
goto out;
}
@@ -6167,7 +6167,7 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
res = -EINVAL;
goto out;
}
TRACE_DBG("block size %ld, block shift %d",
TRACE_DBG("block size %lld, block shift %d",
val, virt_dev->blk_shift);
} else {
PRINT_ERROR("Unknown parameter %s (device %s)", p,
@@ -6177,7 +6177,7 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
}
}
if (virt_dev->file_size % (1 << virt_dev->blk_shift) != 0) {
if ((virt_dev->file_size & ((1 << virt_dev->blk_shift) - 1)) != 0) {
PRINT_ERROR("Device size %lld is not a multiple of the block"
" size %d", virt_dev->file_size,
1 << virt_dev->blk_shift);
@@ -6772,7 +6772,7 @@ static int vdev_size_process_store(struct scst_sysfs_work_item *work)
int size_shift, res = -EINVAL;
if (sscanf(work->buf, "%d %lld", &size_shift, &new_size) != 2 ||
new_size > (ULONG_MAX >> size_shift))
new_size > (ULLONG_MAX >> size_shift))
goto put;
new_size <<= size_shift;
@@ -6790,7 +6790,7 @@ static int vdev_size_process_store(struct scst_sysfs_work_item *work)
if (!virt_dev->nullio) {
res = -EPERM;
sBUG();
} else if (new_size % (1 << virt_dev->blk_shift) == 0) {
} else if ((new_size & ((1 << virt_dev->blk_shift) - 1)) == 0) {
virt_dev->file_size = new_size;
virt_dev->nblocks = virt_dev->file_size >> dev->block_shift;
} else {