LU-15317 libcfs: Remove D_TTY

[fs/lustre-release.git] / lustre / fld / fld_internal.h

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 5fce515..84c0f92 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/fld/fld_internal.h
  *
@@ -64,15 +63,12 @@ struct fld_stats {
         __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 {
@@ -110,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 {
@@ -181,7 +178,7 @@ int fld_client_rpc(struct obd_export *exp,
                    struct lu_seq_range *range, __u32 fld_op,
                   struct ptlrpc_request **reqp);
 
-extern struct lprocfs_vars fld_client_debugfs_list[];
+extern struct ldebugfs_vars fld_client_debugfs_list[];
 
 struct fld_cache *fld_cache_init(const char *name,
                                  int cache_size, int cache_threshold);
@@ -198,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)
 {