summaryrefslogtreecommitdiffstats
path: root/fs/orangefs/orangefs-mod.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-19 11:33:40 -0500
committerMike Marshall <hubcap@omnibond.com>2016-01-23 12:42:43 -0500
commit3e1dd9aa8228cdbbf604006b179efc9312001fb3 (patch)
treec0345526bb7b4ede2e66dd382864d859f4f2fd3d /fs/orangefs/orangefs-mod.c
parentcf0c27715bd640628d39421f3d232c87d7e08954 (diff)
downloadlinux-3e1dd9aa8228cdbbf604006b179efc9312001fb3.tar.bz2
orangefs: use DEFINE_MUTEX (and mutex_init() had been too late)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/orangefs-mod.c')
-rw-r--r--fs/orangefs/orangefs-mod.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index cac52a9175db..7434fa036328 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -70,7 +70,7 @@ module_param(op_timeout_secs, int, 0);
module_param(slot_timeout_secs, int, 0);
/* synchronizes the request device file */
-struct mutex devreq_mutex;
+DEFINE_MUTEX(devreq_mutex);
/*
* Blocks non-priority requests from being queued for servicing. This
@@ -78,7 +78,7 @@ struct mutex devreq_mutex;
* for now it's only being used to stall the op addition to the request
* list
*/
-struct mutex request_mutex;
+DEFINE_MUTEX(request_mutex);
/* hash table for storing operations waiting for matching downcall */
struct list_head *htable_ops_in_progress;
@@ -160,9 +160,6 @@ static int __init orangefs_init(void)
goto cleanup_kiocb;
}
- mutex_init(&devreq_mutex);
- mutex_init(&request_mutex);
-
htable_ops_in_progress =
kcalloc(hash_table_size, sizeof(struct list_head), GFP_KERNEL);
if (!htable_ops_in_progress) {