* [PATCH -next] eCryptfs: Use DEFINE_MUTEX() for mutex lock
@ 2021-04-09 9:51 ` Ye Bin
0 siblings, 0 replies; 3+ messages in thread
From: Ye Bin @ 2021-04-09 9:51 UTC (permalink / raw)
To: yebin10, Tyler Hicks, Johannes Weiner, Michal Hocko, Waiman Long,
Andrew Morton, David Howells
Cc: ecryptfs, kernel-janitors, Hulk Robot
mutex lock can be initialized automatically with DEFINE_MUTEX()
rather than explicitly calling mutex_init().
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
fs/ecryptfs/messaging.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index c0dfd9647627..25ed9baf524e 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -14,10 +14,10 @@
static LIST_HEAD(ecryptfs_msg_ctx_free_list);
static LIST_HEAD(ecryptfs_msg_ctx_alloc_list);
-static struct mutex ecryptfs_msg_ctx_lists_mux;
+static DEFINE_MUTEX(ecryptfs_msg_ctx_lists_mux);
static struct hlist_head *ecryptfs_daemon_hash;
-struct mutex ecryptfs_daemon_hash_mux;
+DEFINE_MUTEX(ecryptfs_daemon_hash_mux);
static int ecryptfs_hash_bits;
#define ecryptfs_current_euid_hash(uid) \
hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits)
@@ -359,7 +359,6 @@ int __init ecryptfs_init_messaging(void)
"too large, defaulting to [%d] users\n", __func__,
ecryptfs_number_of_users);
}
- mutex_init(&ecryptfs_daemon_hash_mux);
mutex_lock(&ecryptfs_daemon_hash_mux);
ecryptfs_hash_bits = 1;
while (ecryptfs_number_of_users >> ecryptfs_hash_bits)
@@ -383,7 +382,6 @@ int __init ecryptfs_init_messaging(void)
rc = -ENOMEM;
goto out;
}
- mutex_init(&ecryptfs_msg_ctx_lists_mux);
mutex_lock(&ecryptfs_msg_ctx_lists_mux);
ecryptfs_msg_counter = 0;
for (i = 0; i < ecryptfs_message_buf_len; i++) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH -next] eCryptfs: Use DEFINE_MUTEX() for mutex lock
@ 2021-04-09 9:51 ` Ye Bin
0 siblings, 0 replies; 3+ messages in thread
From: Ye Bin @ 2021-04-09 9:51 UTC (permalink / raw)
To: yebin10, Tyler Hicks, Johannes Weiner, Michal Hocko, Waiman Long,
Andrew Morton, David Howells
Cc: ecryptfs, kernel-janitors, Hulk Robot
mutex lock can be initialized automatically with DEFINE_MUTEX()
rather than explicitly calling mutex_init().
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
fs/ecryptfs/messaging.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index c0dfd9647627..25ed9baf524e 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -14,10 +14,10 @@
static LIST_HEAD(ecryptfs_msg_ctx_free_list);
static LIST_HEAD(ecryptfs_msg_ctx_alloc_list);
-static struct mutex ecryptfs_msg_ctx_lists_mux;
+static DEFINE_MUTEX(ecryptfs_msg_ctx_lists_mux);
static struct hlist_head *ecryptfs_daemon_hash;
-struct mutex ecryptfs_daemon_hash_mux;
+DEFINE_MUTEX(ecryptfs_daemon_hash_mux);
static int ecryptfs_hash_bits;
#define ecryptfs_current_euid_hash(uid) \
hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits)
@@ -359,7 +359,6 @@ int __init ecryptfs_init_messaging(void)
"too large, defaulting to [%d] users\n", __func__,
ecryptfs_number_of_users);
}
- mutex_init(&ecryptfs_daemon_hash_mux);
mutex_lock(&ecryptfs_daemon_hash_mux);
ecryptfs_hash_bits = 1;
while (ecryptfs_number_of_users >> ecryptfs_hash_bits)
@@ -383,7 +382,6 @@ int __init ecryptfs_init_messaging(void)
rc = -ENOMEM;
goto out;
}
- mutex_init(&ecryptfs_msg_ctx_lists_mux);
mutex_lock(&ecryptfs_msg_ctx_lists_mux);
ecryptfs_msg_counter = 0;
for (i = 0; i < ecryptfs_message_buf_len; i++) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] eCryptfs: Use DEFINE_MUTEX() for mutex lock
2021-04-09 9:51 ` Ye Bin
(?)
@ 2021-04-18 17:34 ` Tyler Hicks
-1 siblings, 0 replies; 3+ messages in thread
From: Tyler Hicks @ 2021-04-18 17:34 UTC (permalink / raw)
To: Ye Bin
Cc: Johannes Weiner, Michal Hocko, Waiman Long, Andrew Morton,
David Howells, ecryptfs, kernel-janitors, Hulk Robot
On 2021-04-09 17:51:42, Ye Bin wrote:
> mutex lock can be initialized automatically with DEFINE_MUTEX()
> rather than explicitly calling mutex_init().
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Ye Bin <yebin10@huawei.com>
This looks good to me. Thanks for the fix.
Tyler
> ---
> fs/ecryptfs/messaging.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
> index c0dfd9647627..25ed9baf524e 100644
> --- a/fs/ecryptfs/messaging.c
> +++ b/fs/ecryptfs/messaging.c
> @@ -14,10 +14,10 @@
>
> static LIST_HEAD(ecryptfs_msg_ctx_free_list);
> static LIST_HEAD(ecryptfs_msg_ctx_alloc_list);
> -static struct mutex ecryptfs_msg_ctx_lists_mux;
> +static DEFINE_MUTEX(ecryptfs_msg_ctx_lists_mux);
>
> static struct hlist_head *ecryptfs_daemon_hash;
> -struct mutex ecryptfs_daemon_hash_mux;
> +DEFINE_MUTEX(ecryptfs_daemon_hash_mux);
> static int ecryptfs_hash_bits;
> #define ecryptfs_current_euid_hash(uid) \
> hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits)
> @@ -359,7 +359,6 @@ int __init ecryptfs_init_messaging(void)
> "too large, defaulting to [%d] users\n", __func__,
> ecryptfs_number_of_users);
> }
> - mutex_init(&ecryptfs_daemon_hash_mux);
> mutex_lock(&ecryptfs_daemon_hash_mux);
> ecryptfs_hash_bits = 1;
> while (ecryptfs_number_of_users >> ecryptfs_hash_bits)
> @@ -383,7 +382,6 @@ int __init ecryptfs_init_messaging(void)
> rc = -ENOMEM;
> goto out;
> }
> - mutex_init(&ecryptfs_msg_ctx_lists_mux);
> mutex_lock(&ecryptfs_msg_ctx_lists_mux);
> ecryptfs_msg_counter = 0;
> for (i = 0; i < ecryptfs_message_buf_len; i++) {
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-18 17:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 9:51 [PATCH -next] eCryptfs: Use DEFINE_MUTEX() for mutex lock Ye Bin
2021-04-09 9:51 ` Ye Bin
2021-04-18 17:34 ` Tyler Hicks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.