From 7dcd0cc20ea6e1ba389141f5c489aecf73e3a94d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 18 Jun 2019 14:13:54 +0000 Subject: [PATCH] scst_vdisk: Invert an if-condition (merge r8429 from trunk) This patch does not change any functionality. git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@8431 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 754bb220c..a73888250 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -6836,13 +6836,13 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask, bio->bi_end_io = vdev_flush_end_io; bio->bi_private = cmd; bio_set_dev(bio, bdev); -#if (!defined(CONFIG_SUSE_KERNEL) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) || \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) - submit_bio(WRITE_FLUSH, bio); -#else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) || \ + (defined(CONFIG_SUSE_KERNEL) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) bio_set_op_attrs(bio, REQ_OP_FLUSH, 0); submit_bio(bio); +#else + submit_bio(WRITE_FLUSH, bio); #endif goto out; } else {