Skip to contentSkip to conversation

staging: lustre: moved extern declarations to a header

PATCH New Anton Gerasimov 1 participant 1 message Sep 23, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 staging: lustre: moved extern declarations to a header

This patch moves declarations of variables used in several files across the ptlrpc module from source files to a local header.

---
 drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    | 1 -
 drivers/staging/lustre/lustre/ptlrpc/nrs.c             | 1 -
 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 6 ++++++
 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c   | 2 --
 4 files changed, 6 insertions(+), 4 deletions(-)
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +0 -1
index 9a10baf..2b88aef 100644
@@ -420,7 +420,6 @@ LUSTRE_RW_ATTR(threads_max);
  * \addtogoup nrs
  * @{
  */
-extern struct nrs_core nrs_core;
 
 /**
  * Translates \e ptlrpc_nrs_pol_state values to human-readable strings.
drivers/staging/lustre/lustre/ptlrpc/nrs.c +0 -1
index d37cdd5..40696f3 100644
@@ -49,7 +49,6 @@
 
 /* XXX: This is just for liblustre. Remove the #if defined directive when the
  * "cfs_" prefix is dropped from cfs_list_head. */
-extern struct list_head ptlrpc_all_services;
 
 /**
  * NRS core object.
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h +6 -0
index 34c7e28..4e35b14 100644
@@ -47,6 +47,10 @@ struct ldlm_res_id;
 struct ptlrpc_request_set;
 extern int test_req_buffer_pressure;
 extern struct mutex ptlrpc_all_services_mutex;
+extern struct list_head ptlrpc_all_services;
+
+extern struct mutex ptlrpcd_mutex;
+extern struct mutex pinger_mutex;
 
 int ptlrpc_start_thread(struct ptlrpc_service_part *svcpt, int wait);
 /* ptlrpcd.c */
@@ -110,6 +114,8 @@ struct nrs_core {
 
 };
 
+extern struct nrs_core nrs_core;
+
 int ptlrpc_service_nrs_setup(struct ptlrpc_service *svc);
 void ptlrpc_service_nrs_cleanup(struct ptlrpc_service *svc);
 
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c +0 -2
index 9985fb6..d12e95b 100644
@@ -48,8 +48,6 @@ extern spinlock_t ptlrpc_last_xid_lock;
 #if RS_DEBUG
 extern spinlock_t ptlrpc_rs_debug_lock;
 #endif
-extern struct mutex pinger_mutex;
-extern struct mutex ptlrpcd_mutex;
 
 static int __init ptlrpc_init(void)
 {
Signature · 1 line
2.5.1