From 511f2fc10f7451a5dcd65f092b8eea96a446ab1d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Thu, 11 Jun 2015 17:12:13 +0000
Subject: [PATCH] scst: Allow compiling iSER/SRP against OFED/MLNX_OFED (merge
 r6236 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6288 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/scst.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scst/include/scst.h b/scst/include/scst.h
index cb0f46bf6..32c0799ed 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -246,7 +246,8 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
 #endif
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) && \
+	!defined(CONFIG_COMPAT_KERNEL_3_12)
 /*
  * See also patch "new helper: file_inode(file)" (commit ID
  * 496ad9aa8ef448058e36ca7a787c61f2e63f0f54).