Skip to contentSkip to conversation

lib-error-inject-convert-to-define_seq_attribute.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jun 17, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/error-inject: convert to DEFINE_SEQ_ATTRIBUTE
has been removed from the -mm tree. Its filename was
lib-error-inject-convert-to-define_seq_attribute.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: wuchi <[email protected]>
Subject: lib/error-inject: convert to DEFINE_SEQ_ATTRIBUTE
Date: Sun, 12 Jun 2022 13:20:15 +0800

Use DEFINE_SEQ_ATTRIBUTE helper macro to simplify the code.

Cc Masami Hiramatsu (Google) <[email protected]>
Cc Martin KaFai Lau <[email protected]>
Cc Song Liu <[email protected]>
Cc Yonghong Song <[email protected]>
Cc John Fastabend <[email protected]>
Cc KP Singh <[email protected]>

---

 lib/error-inject.c |   16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)
lib/error-inject.c renamed from lib/error-inject.c~lib-error-inject-convert-to-define_seq_attribute +3 -13
@@ -197,24 +197,14 @@ static int ei_seq_show(struct seq_file *
 	return 0;
 }
 
-static const struct seq_operations ei_seq_ops = {
+static const struct seq_operations ei_sops = {
 	.start = ei_seq_start,
 	.next  = ei_seq_next,
 	.stop  = ei_seq_stop,
 	.show  = ei_seq_show,
 };
 
-static int ei_open(struct inode *inode, struct file *filp)
-{
-	return seq_open(filp, &ei_seq_ops);
-}
-
-static const struct file_operations debugfs_ei_ops = {
-	.open           = ei_open,
-	.read           = seq_read,
-	.llseek         = seq_lseek,
-	.release        = seq_release,
-};
+DEFINE_SEQ_ATTRIBUTE(ei);
 
 static int __init ei_debugfs_init(void)
 {
@@ -224,7 +214,7 @@ static int __init ei_debugfs_init(void)
 	if (!dir)
 		return -ENOMEM;
 
-	file = debugfs_create_file("list", 0444, dir, NULL, &debugfs_ei_ops);
+	file = debugfs_create_file("list", 0444, dir, NULL, &ei_fops);
 	if (!file) {
 		debugfs_remove(dir);
 		return -ENOMEM;

_

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

lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch