mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 21:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdisk_blockio: Fix the (recently enabled) VERIFY command

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5402 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-04-01 21:05:31 +00:00
parent bb1e348260
commit b7cad33563
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4468,7 +4468,6 @@ static ssize_t blockio_rw_sync(struct scst_vdisk_dev *virt_dev, void *buf,
size_t len, loff_t *loff, unsigned rw)
{
DECLARE_COMPLETION_ONSTACK(c);
int block_shift = virt_dev->dev->block_shift;
struct block_device *bdev = virt_dev->bdev;
struct bio *bio;
void *p;
@@ -4492,9 +4491,9 @@ static ssize_t blockio_rw_sync(struct scst_vdisk_dev *virt_dev, void *buf,
bio->bi_end_io = blockio_end_sync_io;
bio->bi_private = &c;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
bio->bi_sector = *loff << (block_shift - 9);
bio->bi_sector = *loff >> 9;
#else
bio->bi_iter.bi_sector = *loff << (block_shift - 9);
bio->bi_iter.bi_sector = *loff >> 9;
#endif
for (p = buf; p < buf + len; p += bytes) {
off = offset_in_page(p);