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 09/13] net: af_key: use seq_hlist_foo() helpers
Date: Fri, 05 Feb 2010 09:46:55 +0800 [thread overview]
Message-ID: <4B6B788F.7070500@cn.fujitsu.com> (raw)
In-Reply-To: <4B6B77FE.5000104@cn.fujitsu.com>
Simplify seq_file code.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
net/key/af_key.c | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 76fa6fe..cb006b6 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3655,9 +3655,8 @@ static const struct net_proto_family pfkey_family_ops = {
#ifdef CONFIG_PROC_FS
static int pfkey_seq_show(struct seq_file *f, void *v)
{
- struct sock *s;
+ struct sock *s = sk_entry(v);
- s = (struct sock *)v;
if (v == SEQ_START_TOKEN)
seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
else
@@ -3676,19 +3675,9 @@ static void *pfkey_seq_start(struct seq_file *f, loff_t *ppos)
{
struct net *net = seq_file_net(f);
struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
- struct sock *s;
- struct hlist_node *node;
- loff_t pos = *ppos;
read_lock(&pfkey_table_lock);
- if (pos == 0)
- return SEQ_START_TOKEN;
-
- sk_for_each(s, node, &net_pfkey->table)
- if (pos-- == 1)
- return s;
-
- return NULL;
+ return seq_hlist_start_head(&net_pfkey->table, *ppos);
}
static void *pfkey_seq_next(struct seq_file *f, void *v, loff_t *ppos)
@@ -3696,10 +3685,7 @@ static void *pfkey_seq_next(struct seq_file *f, void *v, loff_t *ppos)
struct net *net = seq_file_net(f);
struct netns_pfkey *net_pfkey = net_generic(net, pfkey_net_id);
- ++*ppos;
- return (v == SEQ_START_TOKEN) ?
- sk_head(&net_pfkey->table) :
- sk_next((struct sock *)v);
+ return seq_hlist_next(v, &net_pfkey->table, ppos);
}
static void pfkey_seq_stop(struct seq_file *f, void *v)
--
1.6.3
next prev parent reply other threads:[~2010-02-05 1:46 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 ` [PATCH 03/13] net: x25: use seq_hlist_foo() helpers Li Zefan
2010-02-05 1:45 ` [PATCH 04/13] net: rose: " 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 ` Li Zefan [this message]
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:20 ` [PATCH 09/13] net: af_key: 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=4B6B788F.7070500@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).