scst: Builds now against the openSUSE 11.3 kernel too, which is a 2.6.34 kernel with selective backports from the 2.6.35 kernel.

(Merged r2719 from the ibmvstgt-port branch.)


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2730 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2010-11-17 14:06:40 +00:00
parent 479a519d11
commit 5512203ffc

View File

@@ -1388,7 +1388,9 @@ static void vdisk_exec_unmap(struct scst_cmd *cmd, struct scst_vdisk_thr *thr)
#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)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) \
&& !(LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 34) \
&& defined(CONFIG_SUSE_KERNEL))
err = blkdev_issue_discard(inode->i_bdev, start, len,
GFP_KERNEL, DISCARD_FL_WAIT);
#else