From 9068592a879e42dec612589c038874feffb600e5 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Mon, 8 Feb 2010 23:19:17 +0000
Subject: [PATCH] --- yaml --- r: 183983 b: refs/heads/master c:
 b999748acce739675a5e9420f21e54b8cbad9d81 h: refs/heads/master i:   183981:
 2168e5e784bfd2be6d3358cb07764aab4666c661   183979:
 f46f3392b5be56e0ec0f0ac02fa97c5d1d169eeb   183975:
 3cc70d593f3ce224054f59112309c85a1a098dea   183967:
 a9ae9ce646af034bcdd2ca1d972dd01c743fd720 v: v3

---
 [refs]                   |  2 +-
 trunk/net/rose/af_rose.c | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 6a299f58e1c7..db91b9616d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d2e3a149772441a6a146ad96cbae319e27742a
+refs/heads/master: b999748acce739675a5e9420f21e54b8cbad9d81
diff --git a/trunk/net/rose/af_rose.c b/trunk/net/rose/af_rose.c
index 8feb9e5d6623..e90b9b6c16ae 100644
--- a/trunk/net/rose/af_rose.c
+++ b/trunk/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;