LU-6741 osp: Pack small request inline

[fs/lustre-release.git] / lustre / include / lustre_ver.h.in

diff --git a/lustre/include/lustre_ver.h.in b/lustre/include/lustre_ver.h.in
index 583447e..cb8ac71 100644 (file)
--- a/lustre/include/lustre_ver.h.in
+++ b/lustre/include/lustre_ver.h.in
@@ -10,7 +10,16 @@
 #define LUSTRE_FIX @AC_LUSTRE_FIX@
 #define LUSTRE_VERSION_STRING "@AC_LUSTRE_VERSION_STRING@"
 
-#define LUSTRE_VERSION_CODE OBD_OCD_VERSION(LUSTRE_MAJOR,LUSTRE_MINOR,LUSTRE_PATCH,LUSTRE_FIX)
+#define OBD_OCD_VERSION(major, minor, patch, fix)                      \
+       (((major) << 24) + ((minor) << 16) + ((patch) << 8) + (fix))
+
+#define OBD_OCD_VERSION_MAJOR(version) ((int)((version) >> 24) & 255)
+#define OBD_OCD_VERSION_MINOR(version) ((int)((version) >> 16) & 255)
+#define OBD_OCD_VERSION_PATCH(version) ((int)((version) >>  8) & 255)
+#define OBD_OCD_VERSION_FIX(version)   ((int)((version) >>  0) & 255)
+
+#define LUSTRE_VERSION_CODE                                            \
+       OBD_OCD_VERSION(LUSTRE_MAJOR, LUSTRE_MINOR, LUSTRE_PATCH, LUSTRE_FIX)
 
 /* liblustre clients are only allowed to connect if their LUSTRE_FIX mismatches
  * by this amount (set in lustre/autoconf/lustre-version.ac). */
@@ -21,11 +30,6 @@
  * than this amount, client would issue a warning.
  * (set in lustre/autoconf/lustre-version.ac) */
 #define LUSTRE_VERSION_OFFSET_WARN @AC_LUSTRE_CLI_VER_OFFSET_WARN@
-#else
-/* If liblustre version of client and servers it connects to differs by more
- * than this amount, client would issue a warning.
- * (set in lustre/autoconf/lustre-version.ac) */
-#define LUSTRE_VERSION_OFFSET_WARN @AC_LUSTRE_LIB_VER_OFFSET_WARN@
 #endif
 
 #endif