netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 08/13] net: appletalk: use seq_hlist_foo() helpers
Date: Tue, 09 Feb 2010 17:20:15 +0800	[thread overview]
Message-ID: <4B7128CF.7040903@cn.fujitsu.com> (raw)
In-Reply-To: <4B712849.9040400@cn.fujitsu.com>

Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 net/appletalk/atalk_proc.c |   30 +++---------------------------
 1 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index 80caad1..6ef0e76 100644
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -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 "
-- 
1.6.3

  parent reply	other threads:[~2010-02-09  9:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-09  9:18 [PATCH 00/13] net: simplify seq_file code, revised Li Zefan
2010-02-09  9:18 ` [PATCH 01/13] seq_file: Add helpers for iteration over a hlist Li Zefan
2010-02-09  9:18 ` [PATCH 02/13] net: add a wrapper sk_entry() Li Zefan
2010-02-09  9:19 ` [PATCH 03/13] net: x25: use seq_hlist_foo() helpers Li Zefan
2010-02-09  9:19 ` [PATCH 04/13] net: rose: " Li Zefan
2010-02-09  9:19 ` [PATCH 05/13] net: packet: " Li Zefan
2010-02-09  9:19 ` [PATCH 06/13] net: netrom: " Li Zefan
2010-02-09  9:19 ` [PATCH 07/13] net: ax25: " Li Zefan
2010-02-09  9:20 ` Li Zefan [this message]
2010-02-09  9:20 ` [PATCH 09/13] net: af_key: " Li Zefan
2010-02-09  9:20 ` [PATCH 10/13] net: x25: use seq_list_foo() helpers Li Zefan
2010-02-09  9:21 ` [PATCH 11/13] net: irda: " Li Zefan
2010-02-09  9:21 ` [PATCH 12/13] net: ipx: " Li Zefan
2010-02-09  9:21 ` [PATCH 13/13] net: atm: " Li Zefan
2010-02-10 19:31 ` [PATCH 00/13] net: simplify seq_file code, revised David Miller
2010-02-10 20:29   ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2010-02-05  1:44 [PATCH 00/13] net: simplify seq_file code Li Zefan
2010-02-05  1:46 ` [PATCH 08/13] net: appletalk: 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=4B7128CF.7040903@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).