summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2023-11-10 20:59:22 +0100
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2024-01-29 12:05:09 +0300
commit622cd3daa8eae37359a6fd3c07c36d19f66606b5 (patch)
tree06ff826de6cbaa2e0a6822b2d90489c707d561ec
parent1f5fa4b3b85ceb43f1053290f0ade037b50e6297 (diff)
downloadlinux-stable-622cd3daa8eae37359a6fd3c07c36d19f66606b5.tar.gz
linux-stable-622cd3daa8eae37359a6fd3c07c36d19f66606b5.tar.bz2
linux-stable-622cd3daa8eae37359a6fd3c07c36d19f66606b5.zip
fs/ntfs3: Slightly simplify ntfs_inode_printk()
The size passed to snprintf() includes the space for the trailing space. So there is no reason here not to use all the available space. So remove the -1 when computing 'name_len'. While at it, use the size of the array directly instead of the intermediate 'name_len' variable. snprintf() also guaranties that the buffer if NULL terminated, so there is no need to write an additional trailing NULL "To be sure". Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
-rw-r--r--fs/ntfs3/super.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index c55a29793a8d..cef5467fd928 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -122,13 +122,12 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)
if (name) {
struct dentry *de = d_find_alias(inode);
- const u32 name_len = ARRAY_SIZE(s_name_buf) - 1;
if (de) {
spin_lock(&de->d_lock);
- snprintf(name, name_len, " \"%s\"", de->d_name.name);
+ snprintf(name, sizeof(s_name_buf), " \"%s\"",
+ de->d_name.name);
spin_unlock(&de->d_lock);
- name[name_len] = 0; /* To be sure. */
} else {
name[0] = 0;
}