fix fld/iam compilation breakage

diff --git a/lustre/fld/fld_iam.c b/lustre/fld/fld_iam.c
index e676c81..980ec24 100644 (file)
--- a/lustre/fld/fld_iam.c
+++ b/lustre/fld/fld_iam.c
@@ -42,9 +42,28 @@
 #include <linux/md_object.h>
 #include <linux/lustre_mdc.h>
 #include <linux/lustre_fid.h>
-#include <linux/lustre_iam.h>
+/* XXX doesn't exist yet #include <linux/lustre_iam.h> */
 #include "fld_internal.h"
 
+#if 1
+int fld_handle_insert(struct fld_info *fld_info,
+                      fidseq_t seq_num, mdsno_t mdsno)
+{
+        return 0;
+}
+
+int fld_handle_delete(struct fld_info *fld_info,
+                      fidseq_t seq_num, mdsno_t mds_num)
+{
+        return 0;
+}
+
+int fld_handle_lookup(struct fld_info *fld_info,
+                      fidseq_t seq_num, mdsno_t *mds_num)
+{
+        return 0;
+}
+#else
 struct iam_key;
 struct iam_rec;
 
@@ -60,7 +79,7 @@ int fld_handle_insert(struct fld_info *fld_info, fidseq_t seq_num, mdsno_t mdsno
 int fld_handle_delete(struct fld_info *fld_info, fidseq_t seq_num, mdsno_t mds_num)
 {
         handle_t *handle = NULL;
-        return iam_delete(handle, &fld_info->fi_container, 
+        return iam_delete(handle, &fld_info->fi_container,
                           (struct iam_key *)&seq_num);
 }
 
@@ -87,7 +106,7 @@ static int fld_node_check(struct iam_path *path, struct iam_frame *frame)
 {
         return 0;
 }
-static int fld_node_init(struct iam_container *c, struct buffer_head *bh, 
+static int fld_node_init(struct iam_container *c, struct buffer_head *bh,
                            int root)
 {
         return 0;
@@ -137,3 +156,4 @@ void fld_info_fini(struct fld_info *fld_info)
 }
 
 
+#endif

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 4759b60..a706a69 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -66,13 +66,13 @@ enum fld_op {
 
 
 struct fld_info {
-        struct iam_container fi_container;
+        /* XXX doesn't exist yet struct iam_container fi_container; */
 };
 
 int fld_handle_insert(struct fld_info *fld, fidseq_t seq_num, mdsno_t mdsno);
 int fld_handle_delete(struct fld_info *fld, fidseq_t seq_num, mdsno_t mdsno);
 int fld_handle_lookup(struct fld_info *fld, fidseq_t seq_num, mdsno_t *mds);
- 
+
 int fld_info_init(struct fld_info *fld_info);
 void fld_info_fini(struct fld_info *fld_info);
 #endif

diff --git a/lustre/fld/fld_seq.c b/lustre/fld/fld_seq.c
index 6460d97..a8ca007 100644 (file)
--- a/lustre/fld/fld_seq.c
+++ b/lustre/fld/fld_seq.c
@@ -42,7 +42,6 @@
 #include <linux/md_object.h>
 #include <linux/lustre_mdc.h>
 #include <linux/lustre_fid.h>
-#include <linux/lustre_iam.h>
 #include "fld_internal.h"
 
 static int fld_handle(struct lu_context *ctx,
@@ -362,11 +361,11 @@ int fld_server_init(struct fld *fld, struct dt_device *dt)
         lu_device_get(&dt->dd_lu_dev);
         INIT_LIST_HEAD(&fld_list_head.fld_list);
         spin_lock_init(&fld_list_head.fld_lock);
-        
+
         OBD_ALLOC_PTR(fld_info);
         if(!fld_info)
                 return -ENOMEM;
-        fld_info_init(fld_info); 
+        fld_info_init(fld_info);
         fld->fld_info = fld_info;
 
         fld->fld_service =