X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=102dcfac774806c623b3682beaca767667f0db61;hb=44460570fd21a91002190c8a0620923125135b52;hp=d018941434c761a8c170e824ae36890e1a4ce4f4;hpb=8701e7e4b5ec1b34700c95b9b6588f4745730b72;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index d018941..102dcfa 100644
--- a/lustre/include/lustre_fld.h
+++ b/lustre/include/lustre_fld.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,8 +38,9 @@
  * @{
  */
 
-#include <lustre/lustre_idl.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 #include <libcfs/libcfs.h>
+#include <seq_range.h>
 
 struct lu_env;
 struct lu_client_fld;
@@ -70,9 +67,10 @@ struct lu_fld_target {
 };
 
 struct lu_server_fld {
-        /**
-         * Fld dir proc entry. */
-        cfs_proc_dir_entry_t    *lsf_proc_dir;
+	/**
+	 * Fld dir debugfs entry.
+	 */
+	struct dentry		*lsf_debugfs_entry;
 
         /**
          * /fld file object device */
@@ -95,19 +93,25 @@ struct lu_server_fld {
          * Fld service name in form "fld-srv-lustre-MDTXXX" */
         char                     lsf_name[80];
 
+	int (*lsf_seq_lookup)(const struct lu_env *env,
+			      struct lu_server_fld *fld, u64 seq,
+			      struct lu_seq_range *range);
+
 	/**
-	 * Just reformated or upgraded, and this flag is being
+	 * Just reformatted 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 {
 	/**
-	 * Client side proc entry. */
-	struct proc_dir_entry	*lcf_proc_dir;
+	 * Client side debugfs entry.
+	 */
+	struct dentry		*lcf_debugfs_entry;
 
 	/**
 	 * List of exports client FLD knows about. */
@@ -130,10 +134,9 @@ struct lu_client_fld {
         struct fld_cache        *lcf_cache;
 
         /**
-         * Client fld proc entry name. */
+	 * Client fld debugfs entry name.
+	 */
         char                     lcf_name[80];
-
-	int			 lcf_flags;
 };
 
 /* Server methods */
@@ -157,10 +160,10 @@ int fld_insert_entry(const struct lu_env *env,
 		     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);
+		      u64 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);
+		     u64 seq, struct lu_seq_range *range);
 
 int fld_update_from_controller(const struct lu_env *env,
 			       struct lu_server_fld *fld);
@@ -173,15 +176,14 @@ void fld_client_fini(struct lu_client_fld *fld);
 
 void fld_client_flush(struct lu_client_fld *fld);
 
-int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
+int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds,
                       __u32 flags, const struct lu_env *env);
 
 int fld_client_create(struct lu_client_fld *fld,
                       struct lu_seq_range *range,
                       const struct lu_env *env);
 
-int fld_client_delete(struct lu_client_fld *fld,
-                      seqno_t seq,
+int fld_client_delete(struct lu_client_fld *fld, u64 seq,
                       const struct lu_env *env);
 
 int fld_client_add_target(struct lu_client_fld *fld,
@@ -190,7 +192,7 @@ int fld_client_add_target(struct lu_client_fld *fld,
 int fld_client_del_target(struct lu_client_fld *fld,
                           __u64 idx);
 
-void fld_client_proc_fini(struct lu_client_fld *fld);
+void fld_client_debugfs_fini(struct lu_client_fld *fld);
 
 /** @} fld */