rollback my misguided fld fixes

diff --git a/lustre/fld/fld_iam.c b/lustre/fld/fld_iam.c
index 5b027f4..2cdf5a2 100644 (file)
--- a/lustre/fld/fld_iam.c
+++ b/lustre/fld/fld_iam.c
@@ -42,38 +42,9 @@
 #include <linux/md_object.h>
 #include <linux/lustre_mdc.h>
 #include <linux/lustre_fid.h>
-/* XXX doesn't exist yet #include <linux/lustre_iam.h> */
+#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;
-}
-
-int fld_info_init(struct fld_info *fld_info)
-{
-        return 0;
-}
-
-void fld_info_fini(struct fld_info *fld_info)
-{
-}
-
-#else
 struct iam_key;
 struct iam_rec;
 
@@ -165,5 +136,3 @@ void fld_info_fini(struct fld_info *fld_info)
         OBD_FREE_PTR(fld_info);
 }
 
-
-#endif

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index a706a69..11d54d8 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -1,7 +1,7 @@
 /* -*- MODE: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  fld/fld.c
+ *  fld/fld_internal.h
  *
  *  Copyright (C) 2006 Cluster File Systems, Inc.
  *
@@ -26,6 +26,8 @@
 #ifndef _FLD_INTERNAL_H
 #define _FLD_INTERNAL_H
 
+#include <linux/lustre_iam.h>
+
 #define mdsno_t  __u64
 #define fidseq_t __u64
 
@@ -66,7 +68,7 @@ enum fld_op {
 
 
 struct fld_info {
-        /* XXX doesn't exist yet struct iam_container fi_container; */
+        struct iam_container fi_container;
 };
 
 int fld_handle_insert(struct fld_info *fld, fidseq_t seq_num, mdsno_t mdsno);