Commit eac2cece authored by Kefeng Wang's avatar Kefeng Wang Committed by Linus Torvalds

kernel/kprobes.c: convert to use DEFINE_SEQ_ATTRIBUTE macro

Use DEFINE_SEQ_ATTRIBUTE macro to simplify the code.
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Link: http://lkml.kernel.org/r/20200509064031.181091-4-wangkefeng.wang@huawei.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 01a99560
...@@ -2475,24 +2475,14 @@ static int show_kprobe_addr(struct seq_file *pi, void *v) ...@@ -2475,24 +2475,14 @@ static int show_kprobe_addr(struct seq_file *pi, void *v)
return 0; return 0;
} }
static const struct seq_operations kprobes_seq_ops = { static const struct seq_operations kprobes_sops = {
.start = kprobe_seq_start, .start = kprobe_seq_start,
.next = kprobe_seq_next, .next = kprobe_seq_next,
.stop = kprobe_seq_stop, .stop = kprobe_seq_stop,
.show = show_kprobe_addr .show = show_kprobe_addr
}; };
static int kprobes_open(struct inode *inode, struct file *filp) DEFINE_SEQ_ATTRIBUTE(kprobes);
{
return seq_open(filp, &kprobes_seq_ops);
}
static const struct file_operations debugfs_kprobes_operations = {
.open = kprobes_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
/* kprobes/blacklist -- shows which functions can not be probed */ /* kprobes/blacklist -- shows which functions can not be probed */
static void *kprobe_blacklist_seq_start(struct seq_file *m, loff_t *pos) static void *kprobe_blacklist_seq_start(struct seq_file *m, loff_t *pos)
...@@ -2529,24 +2519,13 @@ static void kprobe_blacklist_seq_stop(struct seq_file *f, void *v) ...@@ -2529,24 +2519,13 @@ static void kprobe_blacklist_seq_stop(struct seq_file *f, void *v)
mutex_unlock(&kprobe_mutex); mutex_unlock(&kprobe_mutex);
} }
static const struct seq_operations kprobe_blacklist_seq_ops = { static const struct seq_operations kprobe_blacklist_sops = {
.start = kprobe_blacklist_seq_start, .start = kprobe_blacklist_seq_start,
.next = kprobe_blacklist_seq_next, .next = kprobe_blacklist_seq_next,
.stop = kprobe_blacklist_seq_stop, .stop = kprobe_blacklist_seq_stop,
.show = kprobe_blacklist_seq_show, .show = kprobe_blacklist_seq_show,
}; };
DEFINE_SEQ_ATTRIBUTE(kprobe_blacklist);
static int kprobe_blacklist_open(struct inode *inode, struct file *filp)
{
return seq_open(filp, &kprobe_blacklist_seq_ops);
}
static const struct file_operations debugfs_kprobe_blacklist_ops = {
.open = kprobe_blacklist_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int arm_all_kprobes(void) static int arm_all_kprobes(void)
{ {
...@@ -2705,13 +2684,12 @@ static int __init debugfs_kprobe_init(void) ...@@ -2705,13 +2684,12 @@ static int __init debugfs_kprobe_init(void)
dir = debugfs_create_dir("kprobes", NULL); dir = debugfs_create_dir("kprobes", NULL);
debugfs_create_file("list", 0400, dir, NULL, debugfs_create_file("list", 0400, dir, NULL, &kprobes_fops);
&debugfs_kprobes_operations);
debugfs_create_file("enabled", 0600, dir, &value, &fops_kp); debugfs_create_file("enabled", 0600, dir, &value, &fops_kp);
debugfs_create_file("blacklist", 0400, dir, NULL, debugfs_create_file("blacklist", 0400, dir, NULL,
&debugfs_kprobe_blacklist_ops); &kprobe_blacklist_fops);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment