2020-12-24 13:23:36

by Zheng Yongjun

Subject: [PATCH v2 -next] btrfs: use DEFINE_MUTEX() for mutex lock

mutex lock can be initialized automatically with DEFINE_MUTEX()
rather than explicitly calling mutex_init().

Signed-off-by: Zheng Yongjun <[email protected]>
---
fs/btrfs/check-integrity.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 81a8c87a5afb..783e1cad9ae3 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -371,7 +371,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state,
struct btrfsic_dev_state *dev_state,
u64 dev_bytenr);

-static struct mutex btrfsic_mutex;
+static DEFINE_MUTEX(btrfsic_mutex);
static int btrfsic_is_initialized;
static struct btrfsic_dev_state_hashtable btrfsic_dev_state_hashtable;

@@ -2789,7 +2789,6 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info,
return -ENOMEM;

if (!btrfsic_is_initialized) {
- mutex_init(&btrfsic_mutex);
btrfsic_dev_state_hashtable_init(&btrfsic_dev_state_hashtable);
btrfsic_is_initialized = 1;
}
--
2.22.0

2021-01-04 14:49:40

by David Sterba

Subject: Re: [PATCH v2 -next] btrfs: use DEFINE_MUTEX() for mutex lock

On Thu, Dec 24, 2020 at 09:22:17PM +0800, Zheng Yongjun wrote:
> mutex lock can be initialized automatically with DEFINE_MUTEX()
> rather than explicitly calling mutex_init().

And is there some reason why it should be done that way?