From: Li Zefan <lizf@cn•fujitsu.com>
To: David Miller <davem@davemloft•net>
Cc: Andrew Morton <akpm@linux-foundation•org>,
LKML <linux-kernel@vger•kernel.org>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: [PATCH 03/13] net: x25: use seq_hlist_foo() helpers
Date: Fri, 05 Feb 2010 09:45:23 +0800 [thread overview]
Message-ID: <4B6B7833.5090407@cn.fujitsu.com> (raw)
In-Reply-To: <4B6B77FE.5000104@cn.fujitsu.com>
Simplify seq_file code.
Signed-off-by: Li Zefan <lizf@cn•fujtisu.com>
---
net/x25/x25_proc.c | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 0a04e62..c4cd322 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -93,40 +93,16 @@ out:
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)
@@ -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)
--
1.6.3
next prev parent reply other threads:[~2010-02-05 1:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 1:44 [PATCH 00/13] net: simplify seq_file code Li Zefan
2010-02-05 1:44 ` Li Zefan
2010-02-05 1:58 ` Andrew Morton
2010-02-05 2:12 ` Li Zefan
2010-02-05 4:32 ` David Miller
2010-02-05 5:04 ` [PATCH 01/13] seq_file: Add helpers for iteration over a hlist Li Zefan
2010-02-05 1:45 ` [PATCH 02/13] net: add a wrapper sk_entry() Li Zefan
2010-02-05 1:45 ` Li Zefan [this message]
2010-02-05 1:45 ` [PATCH 04/13] net: rose: use seq_hlist_foo() helpers Li Zefan
2010-02-05 1:45 ` [PATCH 05/13] net: packet: " Li Zefan
2010-02-05 1:46 ` [PATCH 06/13] net: netrom: " Li Zefan
2010-02-05 1:46 ` [PATCH 07/13] net: ax25: " Li Zefan
2010-02-05 1:46 ` [PATCH 08/13] net: appletalk: " Li Zefan
2010-02-05 1:46 ` [PATCH 09/13] net: af_key: " Li Zefan
2010-02-05 1:47 ` [PATCH 10/13] net: x25: use seq_list_foo() helpers Li Zefan
2010-02-05 1:47 ` [PATCH 11/13] net: irda: " Li Zefan
2010-02-05 11:46 ` Paulius Zaleckas
2010-02-09 6:57 ` Li Zefan
2010-02-05 1:47 ` [PATCH 12/13] net: ipx: " Li Zefan
2010-02-05 1:47 ` [PATCH 13/13] net: atm: " Li Zefan
-- strict thread matches above, loose matches on Subject: below --
2010-02-09 9:18 [PATCH 00/13] net: simplify seq_file code, revised Li Zefan
2010-02-09 9:19 ` [PATCH 03/13] net: x25: use seq_hlist_foo() helpers 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=4B6B7833.5090407@cn.fujitsu.com \
--to=lizf@cn$(echo .)fujitsu.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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