aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-08-15 15:21:16 -0400
committerMartin Brandenburg <martin@omnibond.com>2016-08-15 15:21:16 -0400
commita0fe051592f1d31db491bb6cdcc87f512c5b6eaa (patch)
treec3e7dea204c55cd39022de2555eb553944863c1f
parentc27889cdb4eed68c00f0855efa149dc03e67f7ee (diff)
orangefs: make devreq_mutex static
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
-rw-r--r--fs/orangefs/devorangefs-req.c2
-rw-r--r--fs/orangefs/orangefs-kernel.h1
-rw-r--r--fs/orangefs/orangefs-mod.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index 6779cb7b747e..a5c76583dffa 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -20,6 +20,8 @@
20 20
21static int open_access_count; 21static int open_access_count;
22 22
23static DEFINE_MUTEX(devreq_mutex);
24
23#define DUMP_DEVICE_ERROR() \ 25#define DUMP_DEVICE_ERROR() \
24do { \ 26do { \
25 gossip_err("*****************************************************\n");\ 27 gossip_err("*****************************************************\n");\
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 67d391c85465..e1b50a11bc5f 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -510,7 +510,6 @@ bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op);
510 510
511int orangefs_normalize_to_errno(__s32 error_code); 511int orangefs_normalize_to_errno(__s32 error_code);
512 512
513extern struct mutex devreq_mutex;
514extern struct mutex request_mutex; 513extern struct mutex request_mutex;
515extern int debug; 514extern int debug;
516extern int op_timeout_secs; 515extern int op_timeout_secs;
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index 0028c60a46c7..e37853c78361 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -54,9 +54,6 @@ module_param(module_parm_debug_mask, ulong, 0644);
54module_param(op_timeout_secs, int, 0); 54module_param(op_timeout_secs, int, 0);
55module_param(slot_timeout_secs, int, 0); 55module_param(slot_timeout_secs, int, 0);
56 56
57/* synchronizes the request device file */
58DEFINE_MUTEX(devreq_mutex);
59
60/* 57/*
61 * Blocks non-priority requests from being queued for servicing. This 58 * Blocks non-priority requests from being queued for servicing. This
62 * could be used for protecting the request list data structure, but 59 * could be used for protecting the request list data structure, but