iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: x25: use seq_hlist_foo() helpers

Browse Source 
Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujtisu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Li Zefan 2010-02-08 23:19:04 +00:00 committed by David S. Miller
parent c4146644a5
commit 32d2e3a149
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/x25/x25_proc.c
View File

@ -93,40 +93,16 @@ out:
return 0; 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) static void *x25_seq_socket_start(struct seq_file *seq, loff_t *pos)
__acquires(x25_list_lock) __acquires(x25_list_lock)
{ {
loff_t l = *pos;
read_lock_bh(&x25_list_lock); 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) static void *x25_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct sock *s; return seq_hlist_next(v, &x25_list, pos);
++*pos;
if (v == SEQ_START_TOKEN) {
s = sk_head(&x25_list);
goto out;
}
s = sk_next(v);
out:
return s;
} }
static void x25_seq_socket_stop(struct seq_file *seq, void *v) static void x25_seq_socket_stop(struct seq_file *seq, void *v)
@ -148,7 +124,7 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
goto out; goto out;
} }
s = v; s = sk_entry(v);
x25 = x25_sk(s); x25 = x25_sk(s);
if (!x25->neighbour || (dev = x25->neighbour->dev) == NULL) if (!x25->neighbour || (dev = x25->neighbour->dev) == NULL)