Skip to contentSkip to conversation

drivers/staging: Removed unnecessary check for LUSTRE_VERSION_CODE

PATCH New Filipe Goncalves 1 participant 1 message Oct 11, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/staging: Removed unnecessary check for LUSTRE_VERSION_CODE

From: Filipe Gonçalves <[email protected]>

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".

---
 drivers/staging/lustre/lustre/ptlrpc/layout.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/lustre/lustre/ptlrpc/layout.c +0 -11
index 5b83371..78364ec 100644
@@ -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);
 
Signature · 1 line
1.9.1