X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Ffld_internal.h;h=84c0f92ac21f4e2d73067ef83577948e4fd89ce1;hb=fa36c6b0b92335b74280752c1ed31fc8a72e3a8b;hp=43b2f5bb07d4cc6773ed908ff42712121a3c77a2;hpb=b1e595c09e1b07a6840142b3ae015b8a5a8affeb;p=fs%2Flustre-release.git

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 43b2f5b..84c0f92 100644
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.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,11 +23,10 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/fld/fld_internal.h
  *
@@ -60,29 +55,20 @@
 #define __FLD_INTERNAL_H
 
 #include <obd.h>
-#include <lustre/lustre_idl.h>
 #include <libcfs/libcfs.h>
 #include <lustre_fld.h>
 
-enum {
-        LUSTRE_FLD_INIT = 1 << 0,
-        LUSTRE_FLD_RUN  = 1 << 1
-};
-
 struct fld_stats {
         __u64   fst_count;
         __u64   fst_cache;
 };
 
-typedef int (*fld_hash_func_t) (struct lu_client_fld *, __u64);
-
-typedef struct lu_fld_target *
-(*fld_scan_func_t) (struct lu_client_fld *, __u64);
-
 struct lu_fld_hash {
-        const char              *fh_name;
-        fld_hash_func_t          fh_hash_func;
-        fld_scan_func_t          fh_scan_func;
+	const char		*fh_name;
+	int			(*fh_hash_func)(struct lu_client_fld *fld,
+						__u64 seq);
+	struct lu_fld_target *	(*fh_scan_func)(struct lu_client_fld *fld,
+						__u64 seq);
 };
 
 struct fld_cache_entry {
@@ -120,14 +106,15 @@ struct fld_cache {
          * sorted fld entries. */
 	struct list_head	fci_entries_head;
 
-        /**
-         * Cache statistics. */
-        struct fld_stats         fci_stat;
+	/**
+	 * Cache statistics.
+	 */
+	struct fld_stats	fci_stat;
 
-        /**
-         * Cache name used for debug and messages. */
-        char                     fci_name[80];
-	unsigned int		 fci_no_shrink:1;
+	/**
+	 * Cache name used for debug and messages.
+	 */
+	char			fci_name[LUSTRE_MDT_MAXNAMELEN];
 };
 
 enum {
@@ -148,12 +135,6 @@ enum {
 
 extern struct lu_fld_hash fld_hash[];
 
-
-#ifdef LPROCFS
-extern struct proc_dir_entry *fld_type_proc_dir;
-extern struct lprocfs_seq_vars fld_client_proc_list[];
-#endif
-
 # ifdef HAVE_SERVER_SUPPORT
 struct fld_thread_info {
 	struct lu_seq_range fti_rec;
@@ -181,16 +162,15 @@ int fld_index_lookup(const struct lu_env *env, struct lu_server_fld *fld,
 		     u64 seq, struct lu_seq_range *range);
 
 int fld_name_to_index(const char *name, __u32 *index);
-int fld_server_mod_init(void);
 
+int fld_server_mod_init(void);
 void fld_server_mod_exit(void);
 
 int fld_server_read(const struct lu_env *env, struct lu_server_fld *fld,
 		    struct lu_seq_range *range, void *data, int data_len);
-#ifdef LPROCFS
-extern const struct file_operations fld_proc_seq_fops;
-extern struct lprocfs_seq_vars fld_server_proc_list[];
-#endif
+
+extern const struct file_operations fld_debugfs_seq_fops;
+extern struct dentry *fld_debugfs_dir;
 
 # endif /* HAVE_SERVER_SUPPORT */
 
@@ -198,6 +178,8 @@ int fld_client_rpc(struct obd_export *exp,
                    struct lu_seq_range *range, __u32 fld_op,
 		   struct ptlrpc_request **reqp);
 
+extern struct ldebugfs_vars fld_client_debugfs_list[];
+
 struct fld_cache *fld_cache_init(const char *name,
                                  int cache_size, int cache_threshold);
 
@@ -213,24 +195,11 @@ struct fld_cache_entry
 
 int fld_cache_insert_nolock(struct fld_cache *cache,
 			    struct fld_cache_entry *f_new);
-void fld_cache_delete(struct fld_cache *cache,
-                      const struct lu_seq_range *range);
 void fld_cache_delete_nolock(struct fld_cache *cache,
 			     const struct lu_seq_range *range);
 int fld_cache_lookup(struct fld_cache *cache,
 		     const u64 seq, struct lu_seq_range *range);
 
-struct fld_cache_entry *
-fld_cache_entry_lookup(struct fld_cache *cache,
-		       const struct lu_seq_range *range);
-
-void fld_cache_entry_delete(struct fld_cache *cache,
-			    struct fld_cache_entry *node);
-
-struct fld_cache_entry *
-fld_cache_entry_lookup_nolock(struct fld_cache *cache,
-			      const struct lu_seq_range *range);
-
 static inline const char *
 fld_target_name(const struct lu_fld_target *tar)
 {