From 36ddc9df2a2b458bec24ef9a1e372bb403662a39 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 7 Apr 2011 18:43:30 +0000 Subject: [PATCH] 2.6.37 build fix (partially merged r3193 from trunk). git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@3365 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index cf97635bd..cf6e3aa01 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -2809,8 +2809,10 @@ static int blockio_flush(struct block_device *bdev) && !(defined(CONFIG_SUSE_KERNEL) \ && LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 34)) res = blkdev_issue_flush(bdev, NULL); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) res = blkdev_issue_flush(bdev, GFP_KERNEL, NULL, BLKDEV_IFL_WAIT); +#else + res = blkdev_issue_flush(bdev, GFP_KERNEL, NULL); #endif if (res != 0) PRINT_ERROR("blkdev_issue_flush() failed: %d", res);