X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=b09fca85315507049206fdfb5cf3754149102d65;hb=e5d21c292f19d158603f9bd3eac812a8f90c9820;hp=853793d9ef2774be786c8cd5705b28700eecbf86;hpb=b36763df4f2b3695766e90598f9435a814cc10d0;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 853793d..b09fca8 100644
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -43,18 +43,16 @@
  */
 
 #include <lustre/lustre_idl.h>
-#include <lustre_mdt.h>
-#include <dt_object.h>
-
 #include <libcfs/libcfs.h>
 
+struct lu_env;
 struct lu_client_fld;
 struct lu_server_fld;
 struct lu_fld_hash;
 struct fld_cache;
-
-extern const struct dt_index_features fld_index_features;
-extern const char fld_index_name[];
+struct thandle;
+struct dt_device;
+struct dt_object;
 
 /*
  * FLD (Fid Location Database) interface.
@@ -64,12 +62,11 @@ enum {
         LUSTRE_CLI_FLD_HASH_RRB
 };
 
-
 struct lu_fld_target {
-        cfs_list_t               ft_chain;
-        struct obd_export       *ft_exp;
-        struct lu_server_fld    *ft_srv;
-        __u64                    ft_idx;
+	cfs_list_t		ft_chain;
+	struct obd_export      *ft_exp;
+	struct lu_server_fld   *ft_srv;
+	__u64			ft_idx;
 };
 
 struct lu_server_fld {
@@ -98,6 +95,13 @@ struct lu_server_fld {
          * Fld service name in form "fld-srv-lustre-MDTXXX" */
         char                     lsf_name[80];
 
+	/**
+	 * Just reformated or upgraded, and this flag is being
+	 * used to check whether the local FLDB is needs to be
+	 * synced with global FLDB(in MDT0), and it is only needed
+	 * if the MDT is upgraded from < 2.6 to 2.6, i.e. when the
+	 * local FLDB is being invited */
+	unsigned int		 lsf_new:1;
 };
 
 struct lu_client_fld {
@@ -129,43 +133,38 @@ struct lu_client_fld {
          * Client fld proc entry name. */
         char                     lcf_name[80];
 
-        const struct lu_context *lcf_ctx;
-
-        int                      lcf_flags;
-};
-
-/**
- * number of blocks to reserve for particular operations. Should be function of
- * ... something. Stub for now.
- */
-enum {
-        /* one insert operation can involve two delete and one insert */
-        FLD_TXN_INDEX_INSERT_CREDITS  = 60,
-        FLD_TXN_INDEX_DELETE_CREDITS  = 20,
+	int			 lcf_flags;
 };
 
-int fld_query(struct com_thread_info *info);
-
 /* Server methods */
 int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
-		    struct dt_device *dt, const char *prefix, int mds_node_id,
-		    __u32 lsr_flags);
+		    struct dt_device *dt, const char *prefix, int type);
 
 void fld_server_fini(const struct lu_env *env, struct lu_server_fld *fld);
 
 int fld_declare_server_create(const struct lu_env *env,
 			      struct lu_server_fld *fld,
-			      struct lu_seq_range *new,
+			      const struct lu_seq_range *range,
 			      struct thandle *th);
 
 int fld_server_create(const struct lu_env *env,
 		      struct lu_server_fld *fld,
-		      struct lu_seq_range *add_range,
+		      const struct lu_seq_range *add_range,
 		      struct thandle *th);
 
+int fld_insert_entry(const struct lu_env *env,
+		     struct lu_server_fld *fld,
+		     const struct lu_seq_range *range);
+
 int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld,
 		      seqno_t seq, struct lu_seq_range *range);
 
+int fld_local_lookup(const struct lu_env *env, struct lu_server_fld *fld,
+		     seqno_t seq, struct lu_seq_range *range);
+
+int fld_update_from_controller(const struct lu_env *env,
+			       struct lu_server_fld *fld);
+
 /* Client methods */
 int fld_client_init(struct lu_client_fld *fld,
                     const char *prefix, int hash);