Branch: b_new_cmd

change fld to lu_fld

diff --git a/lustre/fld/fld_handle.c b/lustre/fld/fld_handle.c
index 9c845d5..73144c6 100644 (file)
--- a/lustre/fld/fld_handle.c
+++ b/lustre/fld/fld_handle.c
@@ -45,7 +45,7 @@
 #include "fld_internal.h"
 
 static int fld_handle(const struct lu_context *ctx,
-                      struct fld *fld, __u32 opts, struct md_fld *mf);
+                      struct lu_fld *fld, __u32 opts, struct md_fld *mf);
 
 /*XXX maybe these 2 items should go to sbi*/
 struct fld_cache_info *fld_cache = NULL;
@@ -285,7 +285,7 @@ static void __exit fld_mod_exit(void)
 struct fld_list fld_list_head;
 
 static int fld_req_handle0(const struct lu_context *ctx,
-                           struct fld *fld, struct ptlrpc_request *req)
+                           struct lu_fld *fld, struct ptlrpc_request *req)
 {
         struct md_fld *in;
         struct md_fld *out;
@@ -342,7 +342,7 @@ static int fld_req_handle(struct ptlrpc_request *req)
         RETURN(result);
 }
 
-int fld_server_init(const struct lu_context *ctx, struct fld *fld,
+int fld_server_init(const struct lu_context *ctx, struct lu_fld *fld,
                     struct dt_device *dt)
 {
         int result;
@@ -382,7 +382,7 @@ int fld_server_init(const struct lu_context *ctx, struct fld *fld,
 }
 EXPORT_SYMBOL(fld_server_init);
 
-void fld_server_fini(const struct lu_context *ctx, struct fld *fld)
+void fld_server_fini(const struct lu_context *ctx, struct lu_fld *fld)
 {
         struct list_head *pos, *n;
 
@@ -408,7 +408,7 @@ void fld_server_fini(const struct lu_context *ctx, struct fld *fld)
 EXPORT_SYMBOL(fld_server_fini);
 
 static int fld_handle(const struct lu_context *ctx,
-                      struct fld *fld, __u32 opts, struct md_fld *mf)
+                      struct lu_fld *fld, __u32 opts, struct md_fld *mf)
 {
         int rc;
         ENTRY;

diff --git a/lustre/fld/fld_iam.c b/lustre/fld/fld_iam.c
index 270f1e8..b201a5a 100644 (file)
--- a/lustre/fld/fld_iam.c
+++ b/lustre/fld/fld_iam.c
@@ -113,7 +113,7 @@ static struct dt_rec *fld_rec(const struct lu_context *ctx,
         return (void *)&info->fti_rec;
 }
 
-int fld_handle_insert(const struct lu_context *ctx, struct fld *fld,
+int fld_handle_insert(const struct lu_context *ctx, struct lu_fld *fld,
                       fidseq_t seq_num, mdsno_t mds_num)
 {
         struct dt_device *dt = fld->fld_dt;
@@ -136,7 +136,7 @@ int fld_handle_insert(const struct lu_context *ctx, struct fld *fld,
         RETURN(rc);
 }
 
-int fld_handle_delete(const struct lu_context *ctx, struct fld *fld,
+int fld_handle_delete(const struct lu_context *ctx, struct lu_fld *fld,
                       fidseq_t seq_num)
 {
         struct dt_device *dt = fld->fld_dt;
@@ -156,7 +156,7 @@ int fld_handle_delete(const struct lu_context *ctx, struct fld *fld,
 }
 
 int fld_handle_lookup(const struct lu_context *ctx,
-                      struct fld *fld, fidseq_t seq_num, mdsno_t *mds_num)
+                      struct lu_fld *fld, fidseq_t seq_num, mdsno_t *mds_num)
 {
         int result;
 
@@ -170,7 +170,7 @@ int fld_handle_lookup(const struct lu_context *ctx,
         return result;
 }
 
-int fld_iam_init(const struct lu_context *ctx, struct fld *fld)
+int fld_iam_init(const struct lu_context *ctx, struct lu_fld *fld)
 {
         struct dt_device *dt = fld->fld_dt;
         struct dt_object *dt_obj;
@@ -213,7 +213,7 @@ int fld_iam_init(const struct lu_context *ctx, struct fld *fld)
         RETURN(rc);
 }
 
-void fld_iam_fini(const struct lu_context *ctx, struct fld *fld)
+void fld_iam_fini(const struct lu_context *ctx, struct lu_fld *fld)
 {
         if (!IS_ERR(fld->fld_cookie) && fld->fld_cookie != NULL) {
                 fld->fld_dt->dd_ops->dt_index_fini(ctx, fld->fld_cookie);

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 12fc01b..3c3f71c 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -65,13 +65,13 @@ enum fld_op {
 #define FLD_SERVICE_WATCHDOG_TIMEOUT (obd_timeout * 1000)
 
 int fld_handle_insert(const struct lu_context *ctx,
-                      struct fld *fld, fidseq_t seq_num, mdsno_t mdsno);
+                      struct lu_fld *fld, fidseq_t seq_num, mdsno_t mdsno);
 int fld_handle_delete(const struct lu_context *ctx,
-                      struct fld *fld, fidseq_t seq_num);
+                      struct lu_fld *fld, fidseq_t seq_num);
 int fld_handle_lookup(const struct lu_context *ctx,
-                      struct fld *fld, fidseq_t seq_num, mdsno_t *mds);
+                      struct lu_fld *fld, fidseq_t seq_num, mdsno_t *mds);
 
-int fld_iam_init(const struct lu_context *ctx, struct fld *fld);
-void fld_iam_fini(const struct lu_context *ctx, struct fld *fld);
+int fld_iam_init(const struct lu_context *ctx, struct lu_fld *fld);
+void fld_iam_fini(const struct lu_context *ctx, struct lu_fld *fld);
 
 #endif

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index 4d3ebd7..2c9172c 100644 (file)
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -468,7 +468,7 @@ struct lu_site {
         /*
          * Fid location database
          */
-        struct fld        *ls_fld;
+        struct lu_fld        *ls_fld;
 
         /* statistical counters. Protected by nothing, races are accepted. */
         struct {

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 840fcd7..2932abe 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -76,7 +76,7 @@ void fid_to_le(struct lu_fid *dst, const struct lu_fid *src);
 /*
  * fld (fid location database) interface.
  */
-struct fld {
+struct lu_fld {
         struct proc_dir_entry   *fld_proc_entry;
         struct ptlrpc_service   *fld_service;
         struct dt_device        *fld_dt;
@@ -85,8 +85,8 @@ struct fld {
         struct dt_index_cookie  *fld_cookie;
 };
 
-int  fld_server_init(const struct lu_context *ctx, struct fld *fld,
+int  fld_server_init(const struct lu_context *ctx, struct lu_fld *fld,
                      struct dt_device *dt);
-void fld_server_fini(const struct lu_context *ctx, struct fld *fld);
+void fld_server_fini(const struct lu_context *ctx, struct lu_fld *fld);
 
 #endif /* __LINUX_OBD_CLASS_H */