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

Fix compilation on kernels between 2.6.28 and 2.6.34 inclusive.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2350 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-10-05 19:09:08 +00:00
parent 2370609897
commit 6d0fc28d20
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1381,13 +1381,23 @@ static void vdisk_exec_unmap(struct scst_cmd *cmd, struct scst_vdisk_thr *thr)
if (virt_dev->blockio) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 31)
err = blkdev_issue_discard(inode->i_bdev, start, len,
GFP_KERNEL);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
err = blkdev_issue_discard(inode->i_bdev, start, len,
GFP_KERNEL, DISCARD_FL_WAIT);
#else
err = blkdev_issue_discard(inode->i_bdev, start, len,
GFP_KERNEL, BLKDEV_IFL_WAIT);
#endif
if (unlikely(err != 0)) {
PRINT_ERROR("blkdev_issue_discard() for "
"LBA %lld len %d failed with err %d",
(unsigned long long)start, len, err);
goto out_hw_err;
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_write_error));
goto out_put;
}
#else
scst_set_cmd_error(cmd,
@@ -1410,10 +1420,6 @@ out_put:
out:
TRACE_EXIT();
return;
out_hw_err:
scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_write_error));
goto out_put;
}
static void vdisk_exec_inquiry(struct scst_cmd *cmd)