LU-3289 gss: Add Shared key and GSS Null functionality

[fs/lustre-release.git] / lustre / fid / fid_internal.h

diff --git a/lustre/fid/fid_internal.h b/lustre/fid/fid_internal.h
index cb4f0b1..3214832 100644 (file)
--- a/lustre/fid/fid_internal.h
+++ b/lustre/fid/fid_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, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,9 +43,8 @@
 #include <lustre/lustre_idl.h>
 #include <libcfs/libcfs.h>
 
-#ifdef __KERNEL__
-# ifdef HAVE_SERVER_SUPPORT
-#  define HAVE_SEQ_SERVER
+#ifdef HAVE_SERVER_SUPPORT
+# define HAVE_SEQ_SERVER
 
 struct req_capsule;
 
@@ -61,9 +60,9 @@ enum {
 
 extern struct lu_context_key seq_thread_key;
 
-#  ifdef LPROCFS
+# ifdef CONFIG_PROC_FS
 extern struct lprocfs_vars seq_server_proc_list[];
-#  endif
+# endif
 
 /* Store API functions. */
 struct dt_device;
@@ -95,12 +94,10 @@ void fid_server_mod_exit(void);
 int seq_client_alloc_super(struct lu_client_seq *seq,
                           const struct lu_env *env);
 
-# ifdef LPROCFS
+# ifdef CONFIG_PROC_FS
 extern struct lprocfs_vars seq_client_proc_list[];
 # endif
 
-#endif /* __KERNEL__ */
-
 extern struct proc_dir_entry *seq_type_proc_dir;
 
 #endif /* __FID_INTERNAL_H */