X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Ffld_internal.h;h=9ce5591326e5863a2e6d4adfd1c2bf0e721c71f0;hb=3b7d27ea22faf1c6d0a37afa724fd9b5c3240322;hp=ae8dce1d8bc1161a1943e7342a052c8f3df276c2;hpb=f288434cd97d4ce6314054ff73fe0e9ee03eb139;p=fs%2Flustre-release.git

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index ae8dce1..9ce5591 100644
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -27,7 +27,7 @@
  * 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/
@@ -64,11 +64,6 @@
 #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;
@@ -148,11 +143,10 @@ enum {
 
 extern struct lu_fld_hash fld_hash[];
 
-#ifdef __KERNEL__
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 extern struct proc_dir_entry *fld_type_proc_dir;
-extern struct lprocfs_seq_vars fld_client_proc_list[];
+extern struct lprocfs_vars fld_client_proc_list[];
 #endif
 
 # ifdef HAVE_SERVER_SUPPORT
@@ -179,7 +173,7 @@ int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld,
 		     const struct lu_seq_range *new_range, struct thandle *th);
 
 int fld_index_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_name_to_index(const char *name, __u32 *index);
 int fld_server_mod_init(void);
@@ -188,9 +182,9 @@ 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
+#ifdef CONFIG_PROC_FS
 extern const struct file_operations fld_proc_seq_fops;
-extern struct lprocfs_seq_vars fld_server_proc_list[];
+extern struct lprocfs_vars fld_server_proc_list[];
 #endif
 
 # endif /* HAVE_SERVER_SUPPORT */
@@ -198,7 +192,6 @@ extern struct lprocfs_seq_vars fld_server_proc_list[];
 int fld_client_rpc(struct obd_export *exp,
                    struct lu_seq_range *range, __u32 fld_op,
 		   struct ptlrpc_request **reqp);
-#endif /* __KERNEL__ */
 
 struct fld_cache *fld_cache_init(const char *name,
                                  int cache_size, int cache_threshold);
@@ -220,7 +213,7 @@ void fld_cache_delete(struct fld_cache *cache,
 void fld_cache_delete_nolock(struct fld_cache *cache,
 			     const struct lu_seq_range *range);
 int fld_cache_lookup(struct fld_cache *cache,
-                     const seqno_t seq, struct lu_seq_range *range);
+		     const u64 seq, struct lu_seq_range *range);
 
 struct fld_cache_entry *
 fld_cache_entry_lookup(struct fld_cache *cache,