X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_fld.h;h=3d8288b7da89ab5984f4fe264814f1c1fbf7cc69;hb=50ce29a3b59a8c2984a928ea062e0b415739724d;hp=807649deb2d005cc55cd8873d844c5fcced71c7f;hpb=4dcd475716418d7b2093d917a8bffa9ad14e4465;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_fld.h b/lustre/include/lustre_fld.h
index 807649d..3d8288b 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, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,8 +38,10 @@
  * @{
  */
 
-#include <lustre/lustre_idl.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 #include <libcfs/libcfs.h>
+#include <seq_range.h>
+#include <lustre_fid.h>
 
 struct lu_env;
 struct lu_client_fld;
@@ -70,9 +68,10 @@ struct lu_fld_target {
 };
 
 struct lu_server_fld {
-        /**
-         * Fld dir proc entry. */
-	struct proc_dir_entry	*lsf_proc_dir;
+	/**
+	 * Fld dir debugfs entry.
+	 */
+	struct dentry		*lsf_debugfs_entry;
 
         /**
          * /fld file object device */
@@ -91,9 +90,10 @@ struct lu_server_fld {
          * Protect index modifications */
 	struct mutex		lsf_lock;
 
-        /**
-         * Fld service name in form "fld-srv-lustre-MDTXXX" */
-        char                     lsf_name[80];
+	/**
+	 * Fld service name in form "fld-srv-lustre-MDTXXX"
+	 */
+	char			lsf_name[LUSTRE_MDT_MAXNAMELEN];
 
 	int (*lsf_seq_lookup)(const struct lu_env *env,
 			      struct lu_server_fld *fld, u64 seq,
@@ -106,12 +106,14 @@ struct lu_server_fld {
 	 * 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. */
@@ -133,11 +135,10 @@ struct lu_client_fld {
          * Client FLD cache. */
         struct fld_cache        *lcf_cache;
 
-        /**
-         * Client fld proc entry name. */
-        char                     lcf_name[80];
-
-	int			 lcf_flags;
+	/**
+	 * Client fld debugfs entry name.
+	 */
+	char			lcf_name[LUSTRE_MDT_MAXNAMELEN];
 };
 
 /* Server methods */
@@ -193,7 +194,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 */