File drbd-use-DEFINE_MUTEX-insteadm-of-mutex_init.patch of Package drbd.24681

Overview Repositories Revisions Requests Users Attributes Meta

File drbd-use-DEFINE_MUTEX-insteadm-of-mutex_init.patch of Package drbd.24681

From 51ab0d599f21ca5e54f0a813f6936c8d05744a70 Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Wed, 26 May 2021 10:31:55 +0200
Subject: [PATCH] drbd: use DEFINE_MUTEX insteadm of mutex_init()

and move its definition close to the definition of the drbd_resources list,
which it protects.
---
 drbd/drbd_main.c   | 2 +-
 drbd/drbd_sender.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
index 4953b14f..0636adf0 100644
--- a/drbd/drbd_main.c
+++ b/drbd/drbd_main.c
@@ -134,6 +134,7 @@ module_param_named(protocol_version_min, drbd_protocol_version_min, drbd_protoco
  */
 struct idr drbd_devices;
 struct list_head drbd_resources;
+DEFINE_MUTEX(resources_mutex);
 
 struct kmem_cache *drbd_request_cache;
 struct kmem_cache *drbd_ee_cache;	/* peer requests */
@@ -4012,7 +4013,6 @@ static int __init drbd_init(void)
 	drbd_proc = NULL; /* play safe for drbd_cleanup */
 	idr_init(&drbd_devices);
 
-	mutex_init(&resources_mutex);
 	INIT_LIST_HEAD(&drbd_resources);
 
 	err = drbd_genl_register();
diff --git a/drbd/drbd_sender.c b/drbd/drbd_sender.c
index bd90e9c3..fac63d75 100644
--- a/drbd/drbd_sender.c
+++ b/drbd/drbd_sender.c
@@ -50,8 +50,6 @@ static unsigned long get_work_bits(const unsigned long mask, unsigned long *flag
  *
  */
 
-struct mutex resources_mutex;
-
 /* used for synchronous meta data and bitmap IO
  * submitted by drbd_md_sync_page_io()
  */
-- 
2.16.4

Places

File drbd-use-DEFINE_MUTEX-insteadm-of-mutex_init.patch of Package drbd.24681

Places