[lustre-devel] [PATCH 01/27] lustre: misc: cleanup #ifdef

[James Simmons]

With the porting of patches from the OpenSFS branch some if the
build conditionals have leaked in. This patch removes them.

Signed-off-by: James Simmons <jsimmons at infradead.org>
---
 fs/lustre/llite/llite_internal.h |  6 ------
 fs/lustre/obdclass/jobid.c       |  2 --
 fs/lustre/ptlrpc/wiretest.c      |  6 ------
 net/lnet/selftest/conctl.c       | 19 -------------------
 4 files changed, 33 deletions(-)

diff --git a/fs/lustre/llite/llite_internal.h b/fs/lustre/llite/llite_internal.h
index 746ef983edb8..ddcd88ed948d 100644
--- a/fs/lustre/llite/llite_internal.h
+++ b/fs/lustre/llite/llite_internal.h
@@ -536,19 +536,13 @@ static inline void obd_connect_set_name_enc(struct obd_connect_data *data)
 
 static inline bool obd_connect_has_enc_fid2path(struct obd_connect_data *data)
 {
-#ifdef HAVE_LUSTRE_CRYPTO
 	return data->ocd_connect_flags & OBD_CONNECT_FLAGS2 &&
 		data->ocd_connect_flags2 & OBD_CONNECT2_ENCRYPT_FID2PATH;
-#else
-	return false;
-#endif
 }
 
 static inline void obd_connect_set_enc_fid2path(struct obd_connect_data *data)
 {
-#ifdef HAVE_LUSTRE_CRYPTO
 	data->ocd_connect_flags2 |= OBD_CONNECT2_ENCRYPT_FID2PATH;
-#endif
 }
 
 /*
diff --git a/fs/lustre/obdclass/jobid.c b/fs/lustre/obdclass/jobid.c
index 77ea5b26bdf6..1ade7218131b 100644
--- a/fs/lustre/obdclass/jobid.c
+++ b/fs/lustre/obdclass/jobid.c
@@ -34,9 +34,7 @@
 #define DEBUG_SUBSYSTEM S_RPC
 #include <linux/ctype.h>
 #include <linux/user_namespace.h>
-#ifdef HAVE_UIDGID_HEADER
 #include <linux/uidgid.h>
-#endif
 #include <linux/utsname.h>
 
 #include <obd_support.h>
diff --git a/fs/lustre/ptlrpc/wiretest.c b/fs/lustre/ptlrpc/wiretest.c
index cc81d4d6717d..b3135d4a7990 100644
--- a/fs/lustre/ptlrpc/wiretest.c
+++ b/fs/lustre/ptlrpc/wiretest.c
@@ -4656,14 +4656,8 @@ void lustre_assert_wire_constants(void)
 		 (long long)(int)offsetof(struct hsm_request, hr_data_len));
 	LASSERTF((int)sizeof(((struct hsm_request *)0)->hr_data_len) == 4, "found %lld\n",
 		 (long long)(int)sizeof(((struct hsm_request *)0)->hr_data_len));
-#ifdef HAVE_SERVER_SUPPORT
-	LASSERTF(HSM_FORCE_ACTION == 0x00000001UL, "found 0x%.8xUL\n",
-		 (unsigned int)HSM_FORCE_ACTION);
-	LASSERTF(HSM_GHOST_COPY == 0x00000002UL, "found 0x%.8xUL\n",
-		 (unsigned int)HSM_GHOST_COPY);
 
 	/* Checks for struct hsm_user_request */
-#endif
 	LASSERTF((int)sizeof(struct hsm_user_request) == 24, "found %lld\n",
 		 (long long)(int)sizeof(struct hsm_user_request));
 	LASSERTF((int)offsetof(struct hsm_user_request, hur_request) == 0, "found %lld\n",
diff --git a/net/lnet/selftest/conctl.c b/net/lnet/selftest/conctl.c
index a7ec0d54fe02..f79368448d3e 100644
--- a/net/lnet/selftest/conctl.c
+++ b/net/lnet/selftest/conctl.c
@@ -1230,21 +1230,6 @@ static int lst_groups_show_dump(struct sk_buff *msg,
 	return rc;
 }
 
-#ifndef HAVE_NETLINK_CALLBACK_START
-static int lst_old_groups_show_dump(struct sk_buff *msg,
-				    struct netlink_callback *cb)
-{
-	if (!cb->args[0]) {
-		int rc = lst_groups_show_start(cb);
-
-		if (rc < 0)
-			return rc;
-	}
-
-	return lst_groups_show_dump(msg, cb);
-}
-#endif
-
 static const struct genl_multicast_group lst_mcast_grps[] = {
 	{ .name = "sessions",		},
 	{ .name	= "groups",		},
@@ -1258,12 +1243,8 @@ static const struct genl_ops lst_genl_ops[] = {
 	},
 	{
 		.cmd		= LNET_SELFTEST_CMD_GROUPS,
-#ifdef HAVE_NETLINK_CALLBACK_START
 		.start		= lst_groups_show_start,
 		.dumpit		= lst_groups_show_dump,
-#else
-		.dumpit		= lst_old_groups_show_dump,
-#endif
 		.done		= lst_groups_show_done,
 	},
 };
-- 
2.39.3