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 04/13] net: rose: use seq_hlist_foo() helpers
Date: Fri, 05 Feb 2010 09:45:41 +0800 [thread overview]
Message-ID: <4B6B7845.8070507@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/rose/af_rose.c | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 8feb9e5..e90b9b6 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1404,29 +1404,13 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
static void *rose_info_start(struct seq_file *seq, loff_t *pos)
__acquires(rose_list_lock)
{
- int i;
- struct sock *s;
- struct hlist_node *node;
-
spin_lock_bh(&rose_list_lock);
- if (*pos == 0)
- return SEQ_START_TOKEN;
-
- i = 1;
- sk_for_each(s, node, &rose_list) {
- if (i == *pos)
- return s;
- ++i;
- }
- return NULL;
+ return seq_hlist_start_head(&rose_list, *pos);
}
static void *rose_info_next(struct seq_file *seq, void *v, loff_t *pos)
{
- ++*pos;
-
- return (v == SEQ_START_TOKEN) ? sk_head(&rose_list)
- : sk_next((struct sock *)v);
+ return seq_hlist_next(v, &rose_list, pos);
}
static void rose_info_stop(struct seq_file *seq, void *v)
@@ -1444,7 +1428,7 @@ static int rose_info_show(struct seq_file *seq, void *v)
"dest_addr dest_call src_addr src_call dev lci neigh st vs vr va t t1 t2 t3 hb idle Snd-Q Rcv-Q inode\n");
else {
- struct sock *s = v;
+ struct sock *s = sk_entry(v);
struct rose_sock *rose = rose_sk(s);
const char *devname, *callsign;
const struct net_device *dev = rose->device;
--
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 ` [PATCH 03/13] net: x25: use seq_hlist_foo() helpers Li Zefan
2010-02-05 1:45 ` Li Zefan [this message]
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 04/13] net: rose: 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=4B6B7845.8070507@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