2021-04-06 21:06:45

by Huang Guobin

Subject: [PATCH -next] drbd: use DEFINE_SPINLOCK() for spinlock

From: Guobin Huang <[email protected]>

spinlock can be initialized automatically with DEFINE_SPINLOCK()
rather than explicitly calling spin_lock_init().

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Guobin Huang <[email protected]>
---
drivers/block/drbd/drbd_main.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 25cd8a2f729d..d8605159240b 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -125,7 +125,7 @@ struct bio_set drbd_io_bio_set;
member of struct page.
*/
struct page *drbd_pp_pool;
-spinlock_t drbd_pp_lock;
+DEFINE_SPINLOCK(drbd_pp_lock);
int drbd_pp_vacant;
wait_queue_head_t drbd_pp_wait;

@@ -2161,9 +2161,6 @@ static int drbd_create_mempools(void)
if (ret)
goto Enomem;

- /* drbd's page pool */
- spin_lock_init(&drbd_pp_lock);
-
for (i = 0; i < number; i++) {
page = alloc_page(GFP_HIGHUSER);
if (!page)

2021-04-07 06:45:51

by Jens Axboe

Subject: Re: [PATCH -next] drbd: use DEFINE_SPINLOCK() for spinlock

On 4/6/21 6:09 AM, Huang Guobin wrote:
> From: Guobin Huang <[email protected]>
>
> spinlock can be initialized automatically with DEFINE_SPINLOCK()
> rather than explicitly calling spin_lock_init().

Applied, thanks.

--
Jens Axboe