From 3e1dd9aa8228cdbbf604006b179efc9312001fb3 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 19 Jan 2016 11:33:40 -0500 Subject: [PATCH] orangefs: use DEFINE_MUTEX (and mutex_init() had been too late) Signed-off-by: Al Viro Signed-off-by: Mike Marshall --- fs/orangefs/orangefs-mod.c | 7 ++----- 1 file 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) {