From f2ba108911bf2ceed89320da577227840cc2d52b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 5 Jun 2014 06:34:19 +0000 Subject: [PATCH] scst_vdisk: Build fix for kernel versions <= 2.6.32 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5568 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index e9c090a00..049f604e3 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -909,9 +909,14 @@ check: struct request_queue *q; sBUG_ON(!fd_open); q = bdev_get_queue(fd->f_dentry->d_inode->i_bdev); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) || \ + (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6) virt_dev->unmap_opt_gran = q->limits.discard_granularity >> block_shift; virt_dev->unmap_align = q->limits.discard_alignment >> block_shift; virt_dev->unmap_max_lba_cnt = q->limits.max_discard_sectors >> (block_shift - 9); +#else + sBUG_ON(1); +#endif } else { virt_dev->unmap_opt_gran = 1; virt_dev->unmap_align = 0;