Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eCryptfs: Use DEFINE_MUTEX() for mutex lock

Browse Source 
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>
Signed-off-by: Tyler Hicks <code@tyhicks.com>
This commit is contained in:
Ye Bin 2021-04-09 17:51:42 +08:00 committed by Tyler Hicks
parent ffbed072be
commit 724fa86291
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ecryptfs/messaging.c
View File

@ -14,10 +14,10 @@
static LIST_HEAD(ecryptfs_msg_ctx_free_list); static LIST_HEAD(ecryptfs_msg_ctx_free_list);
static LIST_HEAD(ecryptfs_msg_ctx_alloc_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; static struct hlist_head *ecryptfs_daemon_hash;
struct mutex ecryptfs_daemon_hash_mux; DEFINE_MUTEX(ecryptfs_daemon_hash_mux);
static int ecryptfs_hash_bits; static int ecryptfs_hash_bits;
#define ecryptfs_current_euid_hash(uid) \ #define ecryptfs_current_euid_hash(uid) \
hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits) hash_long((unsigned long)from_kuid(&init_user_ns, current_euid()), ecryptfs_hash_bits)
@ -361,7 +361,6 @@ int __init ecryptfs_init_messaging(void)
"too large, defaulting to [%d] users\n", __func__, "too large, defaulting to [%d] users\n", __func__,
ecryptfs_number_of_users); ecryptfs_number_of_users);
} }
mutex_init(&ecryptfs_daemon_hash_mux);
mutex_lock(&ecryptfs_daemon_hash_mux); mutex_lock(&ecryptfs_daemon_hash_mux);
ecryptfs_hash_bits = 1; ecryptfs_hash_bits = 1;
while (ecryptfs_number_of_users >> ecryptfs_hash_bits) while (ecryptfs_number_of_users >> ecryptfs_hash_bits)
@ -385,7 +384,6 @@ int __init ecryptfs_init_messaging(void)
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
} }
mutex_init(&ecryptfs_msg_ctx_lists_mux);
mutex_lock(&ecryptfs_msg_ctx_lists_mux); mutex_lock(&ecryptfs_msg_ctx_lists_mux);
ecryptfs_msg_counter = 0; ecryptfs_msg_counter = 0;
for (i = 0; i < ecryptfs_message_buf_len; i++) { for (i = 0; i < ecryptfs_message_buf_len; i++) {