From: Vladimir Saveliev <Vladimir.Saveliev@sun.com>
Date: Thu, 10 Jun 2010 02:38:40 +0000 (+0400)
Subject: b=21244 lustre_idl.h compilable from userspace
X-Git-Tag: v1_10_0_44~8
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=4bbc97c3522199891e8522cd88c8301adceafde9;ds=sidebyside

b=21244 lustre_idl.h compilable from userspace

move few #include lines to make lustre/lustre_idl.h compilable from userspace

i=andreas.dilger
---

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index c1bf4d8..775e29b 100644
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -42,10 +42,10 @@
 /*
  * struct lu_fid
  */
-#include <lustre/lustre_idl.h>
-
 #include <libcfs/libcfs.h>
 
+#include <lustre/lustre_idl.h>
+
 #include <lu_ref.h>
 
 struct seq_file;
diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ee49e5f..ff1799d 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -91,11 +91,8 @@
 #ifndef _LUSTRE_IDL_H_
 #define _LUSTRE_IDL_H_
 
-#include <libcfs/libcfs.h>
-
 /* Defn's shared with user-space. */
 #include <lustre/lustre_user.h>
-#include <lustre/ll_fiemap.h>
 
 /*
  *  GENERAL STUFF
@@ -2848,8 +2845,6 @@ struct getinfo_fid2path {
 
 void lustre_swab_fid2path (struct getinfo_fid2path *gf);
 
-extern void lustre_swab_kuch(struct kuc_hdr *);
-
 
 #endif
 /** @} lustreidl */
diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 51a5ae5..6d9d725 100644
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -49,11 +49,11 @@
 /*
  * struct lu_fid
  */
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_req_layout.h>
 #include <lustre_mdt.h>
 
-#include <libcfs/libcfs.h>
 
 struct lu_site;
 struct lu_context;
diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 064031c..691df29 100644
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -50,8 +50,8 @@
 #include <liblustre.h>
 #endif
 
-#include <lustre/lustre_idl.h>
 #include <obd_support.h>
+#include <lustre/lustre_idl.h>
 #include <lustre_fid.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 32ccf75..960a7bd 100644
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -54,8 +54,8 @@
 #include <liblustre.h>
 #endif
 
-#include <lustre/lustre_idl.h>
 #include <obd_support.h>
+#include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_dlm.h>
diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 5346d49..e003468 100644
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -52,7 +52,6 @@
 #include <liblustre.h>
 #endif
 
-#include <lustre/lustre_idl.h>
 #include <lustre_log.h>
 #include <obd_support.h>
 #include <lustre_lib.h>
diff --git a/lustre/lmv/lmv_object.c b/lustre/lmv/lmv_object.c
index 6b3d821..f2616d6 100644
--- a/lustre/lmv/lmv_object.c
+++ b/lustre/lmv/lmv_object.c
@@ -50,8 +50,8 @@
 #include <liblustre.h>
 #endif
 
-#include <lustre/lustre_idl.h>
 #include <obd_support.h>
+#include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_dlm.h>
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 94056a7..6225c50 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -1504,6 +1504,14 @@ static void lustre_swab_hal(struct hsm_action_list *h)
         }
 }
 
+static void lustre_swab_kuch(struct kuc_hdr *l)
+{
+        __swab16s(&l->kuc_magic);
+        /* __u8 l->kuc_transport */
+        __swab16s(&l->kuc_msgtype);
+        __swab16s(&l->kuc_msglen);
+}
+
 static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
                                 struct lustre_kernelcomm *lk)
 {
diff --git a/lustre/osd/osd_igif.c b/lustre/osd/osd_igif.c
index b6533bd..4e987a2 100644
--- a/lustre/osd/osd_igif.c
+++ b/lustre/osd/osd_igif.c
@@ -49,14 +49,15 @@
 
 /* LUSTRE_VERSION_CODE */
 #include <lustre_ver.h>
-/* fid stuff */
-#include <lustre/lustre_idl.h>
 
 /* struct osd_inode_id */
 #include "osd_oi.h"
 #include "osd_igif.h"
 #include "osd_internal.h"
 
+/* fid stuff */
+#include <lustre/lustre_idl.h>
+
 void lu_igif_to_id(const struct lu_fid *fid, struct osd_inode_id *id)
 {
         LASSERT(osd_fid_is_igif(fid));
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 8e70b50..094b740 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -2288,12 +2288,3 @@ void lustre_swab_lustre_capa_key(struct lustre_capa_key *k)
         CLASSERT(offsetof(typeof(*k), lk_padding) != 0);
 }
 
-void lustre_swab_kuch(struct kuc_hdr *l)
-{
-        __swab16s(&l->kuc_magic);
-        /* __u8 l->kuc_transport */
-        __swab16s(&l->kuc_msgtype);
-        __swab16s(&l->kuc_msglen);
-}
-EXPORT_SYMBOL(lustre_swab_kuch);
-