Skip to content

Commit

Permalink
net: x25: use seq_hlist_foo() helpers
Browse files Browse the repository at this point in the history
Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujtisu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Li Zefan authored and David S. Miller committed Feb 10, 2010
1 parent c414664 commit 32d2e3a
Showing 1 changed file with 3 additions and 27 deletions.
30 changes: 3 additions & 27 deletions net/x25/x25_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,40 +93,16 @@ static int x25_seq_route_show(struct seq_file *seq, void *v)
return 0;
}

static __inline__ struct sock *x25_get_socket_idx(loff_t pos)
{
struct sock *s;
struct hlist_node *node;

sk_for_each(s, node, &x25_list)
if (!pos--)
goto found;
s = NULL;
found:
return s;
}

static void *x25_seq_socket_start(struct seq_file *seq, loff_t *pos)
__acquires(x25_list_lock)
{
loff_t l = *pos;

read_lock_bh(&x25_list_lock);
return l ? x25_get_socket_idx(--l) : SEQ_START_TOKEN;
return seq_hlist_start_head(&x25_list, *pos);
}

static void *x25_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *s;

++*pos;
if (v == SEQ_START_TOKEN) {
s = sk_head(&x25_list);
goto out;
}
s = sk_next(v);
out:
return s;
return seq_hlist_next(v, &x25_list, pos);
}

static void x25_seq_socket_stop(struct seq_file *seq, void *v)
Expand All @@ -148,7 +124,7 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
goto out;
}

s = v;
s = sk_entry(v);
x25 = x25_sk(s);

if (!x25->neighbour || (dev = x25->neighbour->dev) == NULL)
Expand Down

0 comments on commit 32d2e3a

Please sign in to comment.