Skip to content

Commit

Permalink
lockdep: Simplify lockdep_chains seqfile code
Browse files Browse the repository at this point in the history
- make lc_next() call lc_start()
- use lock_chains directly instead of storing it in m->private

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <4A88ED57.5060609@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Li Zefan authored and Ingo Molnar committed Aug 17, 2009
1 parent 8109e1d commit 12aac19
Showing 1 changed file with 7 additions and 30 deletions.
37 changes: 7 additions & 30 deletions kernel/lockdep_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,26 +113,6 @@ static const struct file_operations proc_lockdep_operations = {
};

#ifdef CONFIG_PROVE_LOCKING
static void *lc_next(struct seq_file *m, void *v, loff_t *pos)
{
struct lock_chain *chain;

(*pos)++;

if (v == SEQ_START_TOKEN)
chain = m->private;
else {
chain = v;

if (*pos - 1 < nr_lock_chains)
chain = lock_chains + (*pos - 1);
else
chain = NULL;
}

return chain;
}

static void *lc_start(struct seq_file *m, loff_t *pos)
{
if (*pos == 0)
Expand All @@ -144,6 +124,12 @@ static void *lc_start(struct seq_file *m, loff_t *pos)
return NULL;
}

static void *lc_next(struct seq_file *m, void *v, loff_t *pos)
{
(*pos)++;
return lc_start(m, pos);
}

static void lc_stop(struct seq_file *m, void *v)
{
}
Expand Down Expand Up @@ -184,16 +170,7 @@ static const struct seq_operations lockdep_chains_ops = {

static int lockdep_chains_open(struct inode *inode, struct file *file)
{
int res = seq_open(file, &lockdep_chains_ops);
if (!res) {
struct seq_file *m = file->private_data;

if (nr_lock_chains)
m->private = lock_chains;
else
m->private = NULL;
}
return res;
return seq_open(file, &lockdep_chains_ops);
}

static const struct file_operations proc_lockdep_chains_operations = {
Expand Down

0 comments on commit 12aac19

Please sign in to comment.