Commit 3d5bb3a2 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Zheng Zengkai
Browse files

fs: dlm: Simplify buffer size computation in dlm_create_debug_file() 

stable inclusion
from stable-v6.6.2
commit 4bc46c047ecf1818e6a053fbb399aab9c476c16d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4bc46c047ecf1818e6a053fbb399aab9c476c16d



--------------------------------

[ Upstream commit 19b3102c0b5350621e7492281f2be0f071fb7e31 ]

Use sizeof(name) instead of the equivalent, but hard coded,
DLM_LOCKSPACE_LEN + 8.

This is less verbose and more future proof.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7925322e

fs/dlm/debug_fs.c

+5 −5
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ void dlm_create_debug_file(struct dlm_ls *ls) 
	/* format 2 */



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_locks", ls->ls_name);

	snprintf(name, sizeof(name), "%s_locks", ls->ls_name);



	ls->ls_debug_locks_dentry = debugfs_create_file(name,

							0644,
@@ -998,7 +998,7 @@ void dlm_create_debug_file(struct dlm_ls *ls) 
	/* format 3 */



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_all", ls->ls_name);

	snprintf(name, sizeof(name), "%s_all", ls->ls_name);



	ls->ls_debug_all_dentry = debugfs_create_file(name,

						      S_IFREG | S_IRUGO,
@@ -1009,7 +1009,7 @@ void dlm_create_debug_file(struct dlm_ls *ls) 
	/* format 4 */



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_toss", ls->ls_name);

	snprintf(name, sizeof(name), "%s_toss", ls->ls_name);



	ls->ls_debug_toss_dentry = debugfs_create_file(name,

						       S_IFREG | S_IRUGO,
@@ -1018,7 +1018,7 @@ void dlm_create_debug_file(struct dlm_ls *ls) 
						       &format4_fops);



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_waiters", ls->ls_name);

	snprintf(name, sizeof(name), "%s_waiters", ls->ls_name);



	ls->ls_debug_waiters_dentry = debugfs_create_file(name,

							  0644,
@@ -1029,7 +1029,7 @@ void dlm_create_debug_file(struct dlm_ls *ls) 
	/* format 5 */



	memset(name, 0, sizeof(name));

	snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_queued_asts", ls->ls_name);

	snprintf(name, sizeof(name), "%s_queued_asts", ls->ls_name);



	ls->ls_debug_queued_asts_dentry = debugfs_create_file(name,

							      0644,