[merged mm-nonmm-stable] ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch removed from -mm tree

[merged mm-nonmm-stable] ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: ocfs2: move from strlcpy with unused retval to strscpy
has been removed from the -mm tree.  Its filename was
     ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: ocfs2: move from strlcpy with unused retval to strscpy
Date: Thu, 18 Aug 2022 23:01:13 +0200

Follow the advice of the below link and prefer 'strscpy' in this
subsystem.  Conversion is 1:1 because the return value is not used. 
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Link: https://lkml.kernel.org/r/20220818210123.7637-4-wsa+renesas@sang-engineering.com
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ocfs2/stackglue.c |    4 ++--
 fs/ocfs2/super.c     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/fs/ocfs2/stackglue.c~ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/fs/ocfs2/stackglue.c
@@ -334,10 +334,10 @@ int ocfs2_cluster_connect(const char *st
 		goto out;
 	}
 
-	strlcpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1);
+	strscpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1);
 	new_conn->cc_namelen = grouplen;
 	if (cluster_name_len)
-		strlcpy(new_conn->cc_cluster_name, cluster_name,
+		strscpy(new_conn->cc_cluster_name, cluster_name,
 			CLUSTER_NAME_MAX + 1);
 	new_conn->cc_cluster_name_len = cluster_name_len;
 	new_conn->cc_recovery_handler = recovery_handler;
--- a/fs/ocfs2/super.c~ocfs2-move-from-strlcpy-with-unused-retval-to-strscpy
+++ a/fs/ocfs2/super.c
@@ -2221,7 +2221,7 @@ static int ocfs2_initialize_super(struct
 		goto out_journal;
 	}
 
-	strlcpy(osb->vol_label, di->id2.i_super.s_label,
+	strscpy(osb->vol_label, di->id2.i_super.s_label,
 		OCFS2_MAX_VOL_LABEL_LEN);
 	osb->root_blkno = le64_to_cpu(di->id2.i_super.s_root_blkno);
 	osb->system_dir_blkno = le64_to_cpu(di->id2.i_super.s_system_dir_blkno);
_

Patches currently in -mm which might be from wsa+renesas@sang-engineering.com are