Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5859 llog: do not cleanup orphans in remote catalogs
[fs/lustre-release.git]
/
lustre
/
fld
/
fld_internal.h
diff --git
a/lustre/fld/fld_internal.h
b/lustre/fld/fld_internal.h
index
9267937
..
473f9fd
100644
(file)
--- 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) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
3
, Intel Corporation.
+ * Copyright (c) 2012, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-148,11
+148,10
@@
enum {
extern struct lu_fld_hash fld_hash[];
extern struct lu_fld_hash fld_hash[];
-#ifdef __KERNEL__
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
extern struct proc_dir_entry *fld_type_proc_dir;
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
#endif
# ifdef HAVE_SERVER_SUPPORT
@@
-188,9
+187,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);
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
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
extern const struct file_operations fld_proc_seq_fops;
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 */
#endif
# endif /* HAVE_SERVER_SUPPORT */
@@
-198,7
+197,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);
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);
struct fld_cache *fld_cache_init(const char *name,
int cache_size, int cache_threshold);