NFS/RDMA: fix for RHEL7.1

Suggested-by: Devesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: Jeff Becker <jeffrey.c.becker@nasa.gov>

diff --git a/ofed_scripts/gen-compat-config.sh b/ofed_scripts/gen-compat-config.sh
index 47b5144e6c15b55d694de32aea11b018a0df08c8..bf89c8160ac907174d056809bfde284bbed78e74 100755 (executable)
--- a/ofed_scripts/gen-compat-config.sh
+++ b/ofed_scripts/gen-compat-config.sh
@@ -229,6 +229,10 @@ if [[ ${CONFIG_COMPAT_RHEL_6_6} = "y" ]]; then
        set_config CONFIG_COMPAT_RPC_XPRT_OPS_HAS_ALLOC_SLOT y
 fi
 
+if [[ ${CONFIG_COMPAT_RHEL_7_1} = "y" ]]; then
+       set_config CONFIG_COMPAT_RPC_XPRT_OPS_HAS_SECURE_PORT y
+fi
+
 if [[ ${RHEL_MAJOR} -eq "6" ]]; then
        set_config CONFIG_COMPAT_IS___SKB_TX_HASH y
        set_config CONFIG_COMPAT_IS_BITMAP y

diff --git a/patches/0025-BACKPORT-nfsrdma-RHEL7.patch b/patches/0025-BACKPORT-nfsrdma-RHEL7.patch
index cec567ce9a5006302f7eb2b8357574be48b20294..24867955fb23ab123e45615d1c7016962978f262 100644 (file)
--- a/patches/0025-BACKPORT-nfsrdma-RHEL7.patch
+++ b/patches/0025-BACKPORT-nfsrdma-RHEL7.patch
@@ -6,7 +6,7 @@ index 4e61880..5620016 100644
  static void svc_rdma_detach(struct svc_xprt *xprt);
  static void svc_rdma_free(struct svc_xprt *xprt);
  static int svc_rdma_has_wspace(struct svc_xprt *xprt);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) || CONFIG_COMPAT_RPC_XPRT_OPS_HAS_SECURE_PORT)
  static int svc_rdma_secure_port(struct svc_rqst *);
 +#endif
  static void rq_cq_reap(struct svcxprt_rdma *xprt);
@@ -16,7 +16,7 @@ index 4e61880..5620016 100644
        .xpo_prep_reply_hdr = svc_rdma_prep_reply_hdr,
        .xpo_has_wspace = svc_rdma_has_wspace,
        .xpo_accept = svc_rdma_accept,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) || CONFIG_COMPAT_RPC_XPRT_OPS_HAS_SECURE_PORT)
        .xpo_secure_port = svc_rdma_secure_port,
 +#endif
  };
@@ -26,7 +26,7 @@ index 4e61880..5620016 100644
        return 1;
  }
  
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) || CONFIG_COMPAT_RPC_XPRT_OPS_HAS_SECURE_PORT)
  static int svc_rdma_secure_port(struct svc_rqst *rqstp)
  {
        return 1;