From 28fd3bef3cd857453a2ca8b3bb4549feae4bf294 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 17 Jun 2011 22:34:04 +0000 Subject: [PATCH] RHEL6 fix git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3586 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index c4cb90a39..1fa6d6863 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1385,7 +1385,7 @@ out: static void vdev_blockio_get_unmap_params(struct scst_vdisk_dev *virt_dev, uint32_t *unmap_gran, uint32_t *unmap_alignment) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) && (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) || (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6) struct file *fd; struct request_queue *q; #endif @@ -1395,7 +1395,7 @@ static void vdev_blockio_get_unmap_params(struct scst_vdisk_dev *virt_dev, *unmap_gran = 1; *unmap_alignment = 0; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) && (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) || (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6) fd = filp_open(virt_dev->filename, O_LARGEFILE, 0600); if (IS_ERR(fd)) { PRINT_ERROR("filp_open(%s) returned error %ld",