diff options
| -rw-r--r-- | fs/orangefs/devorangefs-req.c | 2 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-kernel.h | 1 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-mod.c | 3 |
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 | ||
| 21 | static int open_access_count; | 21 | static int open_access_count; |
| 22 | 22 | ||
| 23 | static DEFINE_MUTEX(devreq_mutex); | ||
| 24 | |||
| 23 | #define DUMP_DEVICE_ERROR() \ | 25 | #define DUMP_DEVICE_ERROR() \ |
| 24 | do { \ | 26 | do { \ |
| 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 | ||
| 511 | int orangefs_normalize_to_errno(__s32 error_code); | 511 | int orangefs_normalize_to_errno(__s32 error_code); |
| 512 | 512 | ||
| 513 | extern struct mutex devreq_mutex; | ||
| 514 | extern struct mutex request_mutex; | 513 | extern struct mutex request_mutex; |
| 515 | extern int debug; | 514 | extern int debug; |
| 516 | extern int op_timeout_secs; | 515 | extern 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); | |||
| 54 | module_param(op_timeout_secs, int, 0); | 54 | module_param(op_timeout_secs, int, 0); |
| 55 | module_param(slot_timeout_secs, int, 0); | 55 | module_param(slot_timeout_secs, int, 0); |
| 56 | 56 | ||
| 57 | /* synchronizes the request device file */ | ||
| 58 | DEFINE_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 |
