Added support for CONFIG_SCSI_SRP_ATTRS

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/Makefile b/Makefile
index d84f09f87c3a6f413314539779cc1c011329a253..72e8de7fa86988395629690224efe618ae421bde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,4 +8,4 @@ obj-$(CONFIG_RDS)               += net/rds/
 obj-$(CONFIG_SUNRPC_XPRT_RDMA)  += net/sunrpc/xprtrdma/
 # obj-$(CONFIG_SCSI_CXGB3_ISCSI)  += drivers/scsi/cxgbi/
 # obj-$(CONFIG_SCSI_CXGB4_ISCSI)  += drivers/scsi/cxgbi/
-# obj-$(CONFIG_SCSI_SRP_ATTRS)    += drivers/scsi/
+obj-$(CONFIG_SCSI_SRP_ATTRS)    += drivers/scsi/

diff --git a/configure b/configure
index 031debf6537156a017a0110ad5237c8e44c5d485..396457ab92911e69e4e85f38f66a82edd028b7dc 100755 (executable)
--- a/configure
+++ b/configure
@@ -374,9 +374,11 @@ main()
                         ;;
                         --with-srp-mod)
                             CONFIG_INFINIBAND_SRP="m"
+                            CONFIG_SCSI_SRP_ATTRS="m"
                         ;;
                         --without-srp-mod)
                             CONFIG_INFINIBAND_SRP=
+                            CONFIG_SCSI_SRP_ATTRS=
                         ;;
                         --with-srp-target-mod)
                             CONFIG_INFINIBAND_SRPT="m"
@@ -667,6 +669,7 @@ CONFIG_INFINIBAND_IPOIB=${CONFIG_INFINIBAND_IPOIB:-''}
 CONFIG_INFINIBAND_IPOIB_CM=${CONFIG_INFINIBAND_IPOIB_CM:-''}
 CONFIG_INFINIBAND_SDP=${CONFIG_INFINIBAND_SDP:-''}
 CONFIG_INFINIBAND_SRP=${CONFIG_INFINIBAND_SRP:-''}
+CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS:-''}
 CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT:-''}
 
 CONFIG_INFINIBAND_USER_MAD=${CONFIG_INFINIBAND_USER_MAD:-''}
@@ -784,6 +787,7 @@ CONFIG_INFINIBAND_IPOIB=${CONFIG_INFINIBAND_IPOIB}
 CONFIG_INFINIBAND_IPOIB_CM=${CONFIG_INFINIBAND_IPOIB_CM}
 CONFIG_INFINIBAND_SDP=${CONFIG_INFINIBAND_SDP}
 CONFIG_INFINIBAND_SRP=${CONFIG_INFINIBAND_SRP}
+CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS}
 CONFIG_INFINIBAND_SRPT=${CONFIG_INFINIBAND_SRPT}
 
 CONFIG_INFINIBAND_USER_MAD=${CONFIG_INFINIBAND_USER_MAD}
@@ -843,7 +847,6 @@ CONFIG_NFSD_V3_ACL=${CONFIG_NFSD_V3_ACL}
 CONFIG_NFSD_V4=${CONFIG_NFSD_V4}
 CONFIG_NFSD_RDMA=${CONFIG_NFSD_RDMA}
 
-CONFIG_SCSI_SRP_ATTRS=${CONFIG_SCSI_SRP_ATTRS}
 
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=${CONFIG_INFINIBAND_IPOIB_DEBUG_DATA}
 CONFIG_INFINIBAND_SDP_SEND_ZCOPY=${CONFIG_INFINIBAND_SDP_SEND_ZCOPY}
@@ -899,6 +902,11 @@ if [ "X${CONFIG_INFINIBAND_SRP}" == "Xm" ]; then
 else
         DEFINE_INFINIBAND_SRP="#undef CONFIG_INFINIBAND_SRP"
 fi
+if [ "X${CONFIG_SCSI_SRP_ATTRS}" == "Xm" ]; then
+        DEFINE_SCSI_SRP_ATTRS="#undef CONFIG_SCSI_SRP_ATTRS\n#define CONFIG_SCSI_SRP_ATTRS 1"
+else
+        DEFINE_SCSI_SRP_ATTRS="/* CONFIG_SCSI_SRP_ATTRS is not set */"
+fi
 if [ "X${CONFIG_INFINIBAND_SRPT}" == "Xm" ]; then
         DEFINE_INFINIBAND_SRPT="#undef CONFIG_INFINIBAND_SRPT\n#define CONFIG_INFINIBAND_SRPT 1"
 else
@@ -1165,11 +1173,6 @@ else
         DEFINE_NFSD_V4="/* CONFIG_NFSD_V4 is not set */"
         DEFINE_NFSD_RDMA="/* CONFIG_NFSD_RDMA is not set */"
 fi
-if [ "X${CONFIG_SCSI_SRP_ATTRS}" == "Xm" ]; then
-        DEFINE_SCSI_SRP_ATTRS="#undef CONFIG_SCSI_SRP_ATTRS\n#define CONFIG_SCSI_SRP_ATTRS 1"
-else
-        DEFINE_SCSI_SRP_ATTRS="/* CONFIG_SCSI_SRP_ATTRS is not set */"
-fi
 cat >> ${AUTOCONF_H} << EOFAUTOCONF
 #ifndef __OFED_BUILD__
 #include_next <linux/autoconf.h>
@@ -1178,6 +1181,7 @@ $(echo -e "${DEFINE_INFINIBAND_IPOIB}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_IPOIB_CM}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SDP}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SRP}" | grep -v undef)
+$(echo -e "${DEFINE_SCSI_SRP_ATTRS}" | grep -v undef)
 $(echo -e "${DEFINE_INFINIBAND_SRPT}" | grep -v undef)
 
 $(echo -e "${DEFINE_INFINIBAND_USER_MAD}" | grep -v undef)
@@ -1255,6 +1259,7 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 #undef CONFIG_INFINIBAND_SDP
 #undef CONFIG_INFINIBAND_SRP
 #undef CONFIG_INFINIBAND_SRPT
+#undef CONFIG_SCSI_SRP_ATTRS
 
 #undef CONFIG_INFINIBAND_USER_MAD
 #undef CONFIG_INFINIBAND_USER_ACCESS
@@ -1314,7 +1319,6 @@ $(echo -e "${DEFINE_INFINIBAND_AMSO1100}" | grep -v undef)
 #undef CONFIG_NFSD_V4
 #undef CONFIG_NFSD_RDMA
 
-#undef CONFIG_SCSI_SRP_ATTRS
 
 #undef CONFIG_INFINIBAND_IPOIB_DEBUG_DATA
 #undef CONFIG_INFINIBAND_SDP_SEND_ZCOPY

diff --git a/ofed_scripts/checkout_files b/ofed_scripts/checkout_files
index 361af08e8b66d037be09ebf6c072f9a6f96c2866..a6050415f5d272e820382881ce6473a5bb4d0bde 100644 (file)
--- a/ofed_scripts/checkout_files
+++ b/ofed_scripts/checkout_files
@@ -9,4 +9,10 @@ include/rdma/
 include/uapi/rdma/
 include/scsi/srp.h
 net/rds/
+include/linux/rds.h
 net/sunrpc/xprtrdma
+drivers/scsi/Makefile
+drivers/scsi/scsi_priv.h
+drivers/scsi/scsi_transport_srp.c
+drivers/scsi/scsi_transport_srp_internal.h
+include/scsi/scsi_transport_srp.h