Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-05-13 21:26:56 -07:00

View File

@@ -8133,7 +8133,7 @@ static int vdev_parse_add_dev_params(struct scst_vdisk_dev *virt_dev,
} else if (!strcasecmp("blocksize", p)) {
virt_dev->blk_shift = scst_calc_block_shift(val);
if (virt_dev->blk_shift < 9) {
PRINT_ERROR("blocksize %u too small", 1<<virt_dev->blk_shift);
PRINT_ERROR("blocksize %llu too small", val);
res = -EINVAL;
goto out;
}
@@ -10376,7 +10376,8 @@ static int vdisk_write_proc(char *buffer, char **start, off_t offset,
block_shift = scst_calc_block_shift(block_size);
if (block_shift < 9) {
PRINT_ERROR("blocksize %u too small", 1<<block_shift);
PRINT_ERROR("blocksize %u too small",
block_size);
res = -EINVAL;
goto out_free_vdev;
}