From: tip-bot for Li Zefan <lizf@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
lizf@cn.fujitsu.com, peterz@infradead.org, tglx@linutronix.de,
mingo@elte.hu
Subject: [tip:core/locking] lockdep: Fix missing entries in /proc/lock_chains
Date: Mon, 17 Aug 2009 08:01:52 GMT [thread overview]
Message-ID: <tip-e9d65725bdf5954283625ca4d770bfc34f2ae56a@git.kernel.org> (raw)
In-Reply-To: <4A88ED25.2040306@cn.fujitsu.com>
Commit-ID: e9d65725bdf5954283625ca4d770bfc34f2ae56a
Gitweb: http://git.kernel.org/tip/e9d65725bdf5954283625ca4d770bfc34f2ae56a
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Mon, 17 Aug 2009 13:39:49 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 17 Aug 2009 09:54:40 +0200
lockdep: Fix missing entries in /proc/lock_chains
Two entries are missing in the output of /proc/lock_chains.
One is chains[1]. When lc_next() is called the 1st time,
chains[0] is returned. And when it's called the 2nd time,
chains[2] is returned.
The other missing ons is, when lc_start() is called the 2nd
time, we should start from chains[@pos-1] but not chains[@pos],
because pos == 0 is the header.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <4A88ED25.2040306@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/lockdep_proc.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 5dbe30b..9a7996e 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -160,8 +160,8 @@ static void *lc_next(struct seq_file *m, void *v, loff_t *pos)
else {
chain = v;
- if (*pos < nr_lock_chains)
- chain = lock_chains + *pos;
+ if (*pos - 1 < nr_lock_chains)
+ chain = lock_chains + (*pos - 1);
else
chain = NULL;
}
@@ -174,8 +174,8 @@ static void *lc_start(struct seq_file *m, loff_t *pos)
if (*pos == 0)
return SEQ_START_TOKEN;
- if (*pos < nr_lock_chains)
- return lock_chains + *pos;
+ if (*pos - 1 < nr_lock_chains)
+ return lock_chains + (*pos - 1);
return NULL;
}
next prev parent reply other threads:[~2009-08-17 8:04 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-bot for Li Zefan [this message]
2009-08-17 5:40 ` [PATCH 3/5] lockdep: Simplify lockdep seqfile code Li Zefan
2009-08-17 8:02 ` [tip:core/locking] " 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=tip-e9d65725bdf5954283625ca4d770bfc34f2ae56a@git.kernel.org \
--to=lizf@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox