From 8c301b658da956f37aba1b023a3af7c51518782f Mon Sep 17 00:00:00 2001
From: Vladimir Saveliev <Vladimir.Saveliev@Sun.COM>
Date: Fri, 28 May 2010 14:58:26 +0400
Subject: [PATCH] b=21244 lustre_idl.h compilable from userspace

- this allows userland programs to include <lustre/lustre_idl.h>
  from stardard include directories
- useless checks for LUSTRE_VERSION_CODE are removed

i=johann
---
 lustre/include/lustre/lustre_idl.h | 16 ----------------
 lustre/include/obd_support.h       |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 9134f52..dffba8f 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -95,11 +95,8 @@
 
 /* Defn's shared with user-space. */
 #include <lustre/lustre_user.h>
-#include <lustre_ver.h>
 #include <lustre/ll_fiemap.h>
 
-#include <libcfs/kp30.h>
-
 /*
  * this file contains all data structures used in Lustre interfaces:
  * - obdo and obd_request records
@@ -419,13 +416,8 @@ struct obd_connect_data {
 
 extern void lustre_swab_connect(struct obd_connect_data *ocd);
 
-/* b1_6 has smaller body. The defines below is for interoperability */
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,0,0,0)
 #define PTLRPC_INTEROP_1_6      1
 #define PTLRPC_BODY_MIN_SIZE    offsetof(struct ptlrpc_body, pb_pre_versions)
-#else
-#define PTLRPC_BODY_MIN_SIZE    sizeof(struct ptlrpc_body)
-#endif
 
 /*
  * Supported checksum algorithms. Up to 32 checksum types are supported.
@@ -2153,7 +2145,6 @@ struct qunit_data {
 #define QDATA_CLR_GRP(qdata)        ((qdata)->qd_flags &= ~LQUOTA_FLAGS_GRP)
 #define QDATA_CLR_CHANGE_QS(qdata)  ((qdata)->qd_flags &= ~LQUOTA_FLAGS_CHG_QS)
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(1, 9, 0, 0)
 /* this will be used when OBD_CONNECT_QUOTA64 is set */
 struct qunit_data_old2 {
         __u32 qd_id; /* ID appiles to (uid, gid) */
@@ -2161,16 +2152,9 @@ struct qunit_data_old2 {
                          * Block quota or file quota occupy one bit */
         __u64 qd_count; /* acquire/release count (bytes for block quota) */
 };
-#else
-#warning "remove quota code above for format absolete in new release"
-#endif
 
 extern void lustre_swab_qdata(struct qunit_data *d);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(1, 9, 0, 0)
 extern void lustre_swab_qdata_old2(struct qunit_data_old2 *d);
-#else
-#warning "remove quota code above for format absolete in new release"
-#endif
 extern int quota_get_qdata(void*req, struct qunit_data *qdata,
                            int is_req, int is_exp);
 extern int quota_copy_qdata(void *request, struct qunit_data *qdata,
diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 621282f..dbd12ff 100644
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -41,6 +41,7 @@
 #include <lvfs.h>
 #include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
+#include <lustre_ver.h>
 
 /* global variables */
 extern struct lprocfs_stats *obd_memory;
-- 
1.8.3.1