Skip to contentSkip to conversation

ocfs2-use-regular-seq_show_option-for-osb_cluster_stack.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Aug 12, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: ocfs2: use regular seq_show_option for osb_cluster_stack
has been removed from the -mm tree. Its filename was
ocfs2-use-regular-seq_show_option-for-osb_cluster_stack.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: Kees Cook <[email protected]>
Subject: ocfs2: use regular seq_show_option for osb_cluster_stack
Date: Wed, 26 Jul 2023 14:59:22 -0700

While cleaning up seq_show_option_n()'s use of strncpy, it was noticed that the osb_cluster_stack member is always NUL-terminated, so there is no need to use the special seq_show_option_n() routine. Replace it with the standard seq_show_option() routine.

---

 fs/ocfs2/super.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ocfs2/super.c renamed from fs/ocfs2/super.c~ocfs2-use-regular-seq_show_option-for-osb_cluster_stack +1 -2
@@ -1517,8 +1517,7 @@ static int ocfs2_show_options(struct seq
 		seq_printf(s, ",localflocks,");
 
 	if (osb->osb_cluster_stack[0])
-		seq_show_option_n(s, "cluster_stack", osb->osb_cluster_stack,
-				  OCFS2_STACK_LABEL_LEN);
+		seq_show_option(s, "cluster_stack", osb->osb_cluster_stack);
 	if (opts & OCFS2_MOUNT_USRQUOTA)
 		seq_printf(s, ",usrquota");
 	if (opts & OCFS2_MOUNT_GRPQUOTA)

_

Patches currently in -mm which might be from [email protected] are