summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre
diff options
context:
space:
mode:
authorFilipe Gonçalves <filipe@codinghighway.com>2014-10-11 22:33:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-29 16:21:55 +0800
commit1bca2822b4420dfc1f7f40bbea5011bbf25e1113 (patch)
tree1c5dac9f8a969ff227efe7ebf867bb4d6fa06740 /drivers/staging/lustre
parent73e0e4dfed4c5c3bd1533321c98f2dac379324f8 (diff)
downloadop-kernel-dev-1bca2822b4420dfc1f7f40bbea5011bbf25e1113.zip
op-kernel-dev-1bca2822b4420dfc1f7f40bbea5011bbf25e1113.tar.gz
drivers/staging: Removed unnecessary check for LUSTRE_VERSION_CODE
Given that this code is now part of the kernel tree, the #ifdef directive comparing LUSTRE_VERSION_CODE to the kernel version is no longer needed. As a side effect, this will also remove the sparse error "directive in argument list". Signed-off-by: Filipe Gonçalves <filipe@codinghighway.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
-rw-r--r--drivers/staging/lustre/lustre/ptlrpc/layout.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c
index 5b83371..78364ec 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/layout.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c
@@ -980,18 +980,7 @@ EXPORT_SYMBOL(RMF_CONN);
struct req_msg_field RMF_CONNECT_DATA =
DEFINE_MSGF("cdata",
RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */,
-#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 7, 50, 0)
sizeof(struct obd_connect_data),
-#else
-/* For interoperability with 1.8 and 2.0 clients/servers.
- * The RPC verification code allows larger RPC buffers, but not
- * smaller buffers. Until we no longer need to keep compatibility
- * with older servers/clients we can only check that the buffer
- * size is at least as large as obd_connect_data_v1. That is not
- * not in itself harmful, since the chance of just corrupting this
- * field is low. See JIRA LU-16 for details. */
- sizeof(struct obd_connect_data_v1),
-#endif
lustre_swab_connect, NULL);
EXPORT_SYMBOL(RMF_CONNECT_DATA);
OpenPOWER on IntegriCloud