|
@@ -144,40 +144,16 @@ out:
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static __inline__ struct sock *atalk_get_socket_idx(loff_t pos)
|
|
|
-{
|
|
|
- struct sock *s;
|
|
|
- struct hlist_node *node;
|
|
|
-
|
|
|
- sk_for_each(s, node, &atalk_sockets)
|
|
|
- if (!pos--)
|
|
|
- goto found;
|
|
|
- s = NULL;
|
|
|
-found:
|
|
|
- return s;
|
|
|
-}
|
|
|
-
|
|
|
static void *atalk_seq_socket_start(struct seq_file *seq, loff_t *pos)
|
|
|
__acquires(atalk_sockets_lock)
|
|
|
{
|
|
|
- loff_t l = *pos;
|
|
|
-
|
|
|
read_lock_bh(&atalk_sockets_lock);
|
|
|
- return l ? atalk_get_socket_idx(--l) : SEQ_START_TOKEN;
|
|
|
+ return seq_hlist_start_head(&atalk_sockets, *pos);
|
|
|
}
|
|
|
|
|
|
static void *atalk_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
{
|
|
|
- struct sock *i;
|
|
|
-
|
|
|
- ++*pos;
|
|
|
- if (v == SEQ_START_TOKEN) {
|
|
|
- i = sk_head(&atalk_sockets);
|
|
|
- goto out;
|
|
|
- }
|
|
|
- i = sk_next(v);
|
|
|
-out:
|
|
|
- return i;
|
|
|
+ return seq_hlist_next(v, &atalk_sockets, pos);
|
|
|
}
|
|
|
|
|
|
static void atalk_seq_socket_stop(struct seq_file *seq, void *v)
|
|
@@ -197,7 +173,7 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v)
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- s = v;
|
|
|
+ s = sk_entry(v);
|
|
|
at = at_sk(s);
|
|
|
|
|
|
seq_printf(seq, "%02X %04X:%02X:%02X %04X:%02X:%02X %08X:%08X "
|