From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/5] lockdep: Simplify lockdep seqfile code
Date: Mon, 17 Aug 2009 13:40:17 +0800 [thread overview]
Message-ID: <4A88ED41.5000000@cn.fujitsu.com> (raw)
In-Reply-To: <4A88ED15.20800@cn.fujitsu.com>
Use seq_list_start_head() and seq_list_next().
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/lockdep_proc.c | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 84c6b1e..d0f53b0 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -25,38 +25,12 @@
static void *l_next(struct seq_file *m, void *v, loff_t *pos)
{
- struct lock_class *class;
-
- (*pos)++;
-
- if (v == SEQ_START_TOKEN)
- class = m->private;
- else {
- class = v;
-
- if (class->lock_entry.next != &all_lock_classes)
- class = list_entry(class->lock_entry.next,
- struct lock_class, lock_entry);
- else
- class = NULL;
- }
-
- return class;
+ return seq_list_next(v, &all_lock_classes, pos);
}
static void *l_start(struct seq_file *m, loff_t *pos)
{
- struct lock_class *class;
- loff_t i = 0;
-
- if (*pos == 0)
- return SEQ_START_TOKEN;
-
- list_for_each_entry(class, &all_lock_classes, lock_entry) {
- if (++i == *pos)
- return class;
- }
- return NULL;
+ return seq_list_start_head(&all_lock_classes, *pos);
}
static void l_stop(struct seq_file *m, void *v)
@@ -82,11 +56,11 @@ static void print_name(struct seq_file *m, struct lock_class *class)
static int l_show(struct seq_file *m, void *v)
{
- struct lock_class *class = v;
+ struct lock_class *class = list_entry(v, struct lock_class, lock_entry);
struct lock_list *entry;
char usage[LOCK_USAGE_CHARS];
- if (v == SEQ_START_TOKEN) {
+ if (v == &all_lock_classes) {
seq_printf(m, "all lock classes:\n");
return 0;
}
@@ -128,17 +102,7 @@ static const struct seq_operations lockdep_ops = {
static int lockdep_open(struct inode *inode, struct file *file)
{
- int res = seq_open(file, &lockdep_ops);
- if (!res) {
- struct seq_file *m = file->private_data;
-
- if (!list_empty(&all_lock_classes))
- m->private = list_entry(all_lock_classes.next,
- struct lock_class, lock_entry);
- else
- m->private = NULL;
- }
- return res;
+ return seq_open(file, &lockdep_ops);
}
static const struct file_operations proc_lockdep_operations = {
--
1.6.3
next prev parent reply other threads:[~2009-08-17 5:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-17 5:39 [PATCH 1/5] lock_dep: Fix missing entry in /proc/lock_stat Li Zefan
2009-08-17 5:39 ` [PATCH 2/5] lock_dep: Fix missing entries in /proc/lock_chains Li Zefan
2009-08-17 8:01 ` [tip:core/locking] lockdep: " tip-bot for Li Zefan
2009-08-17 5:40 ` Li Zefan [this message]
2009-08-17 8:02 ` [tip:core/locking] lockdep: Simplify lockdep seqfile code tip-bot for Li Zefan
2009-08-17 5:40 ` [PATCH 4/5] lockdep: Simplify lockdep_chains " Li Zefan
2009-08-17 8:02 ` [tip:core/locking] " tip-bot for Li Zefan
2009-08-17 5:40 ` [PATCH 5/5] lockdep: Simplify lock_stat " Li Zefan
2009-08-17 8:02 ` [tip:core/locking] " tip-bot for Li Zefan
2009-08-17 7:55 ` [PATCH 1/5] lock_dep: Fix missing entry in /proc/lock_stat Ingo Molnar
2009-08-17 8:01 ` [tip:core/locking] lockdep: " tip-bot for Li Zefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A88ED41.5000000@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.