lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: ax25: use seq_hlist_foo() helpers

Browse Source 
Simplify seq_file code.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Li Zefan
2010-02-08 23:19:59 +00:00
committed by David S. Miller
parent 90dd7f5ace
commit b512f3d841
2 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/ax25/af_ax25.c
View File

@@ -1863,25 +1863,13 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
static void *ax25_info_start(struct seq_file *seq, loff_t *pos) static void *ax25_info_start(struct seq_file *seq, loff_t *pos)
__acquires(ax25_list_lock) __acquires(ax25_list_lock)
{ {
struct ax25_cb *ax25;
struct hlist_node *node;
int i = 0;
spin_lock_bh(&ax25_list_lock); spin_lock_bh(&ax25_list_lock);
ax25_for_each(ax25, node, &ax25_list) { return seq_hlist_start(&ax25_list, *pos);
if (i == *pos)
return ax25;
++i;
}
return NULL;
} }
static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos) static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
++*pos; return seq_hlist_next(v, &ax25_list, pos);
return hlist_entry( ((struct ax25_cb *)v)->ax25_node.next,
struct ax25_cb, ax25_node);
} }
static void ax25_info_stop(struct seq_file *seq, void *v) static void ax25_info_stop(struct seq_file *seq, void *v)
@@ -1892,7 +1880,7 @@ static void ax25_info_stop(struct seq_file *seq, void *v)
static int ax25_info_show(struct seq_file *seq, void *v) static int ax25_info_show(struct seq_file *seq, void *v)
{ {
ax25_cb *ax25 = v; ax25_cb *ax25 = hlist_entry(v, struct ax25_cb, ax25_node);
char buf[11]; char buf[11];
int k; int k;

25
net/ax25/ax25_uid.c
View File

@@ -146,31 +146,13 @@ int ax25_uid_ioctl(int cmd, struct sockaddr_ax25 *sax)
static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos) static void *ax25_uid_seq_start(struct seq_file *seq, loff_t *pos)
__acquires(ax25_uid_lock) __acquires(ax25_uid_lock)
{ {
struct ax25_uid_assoc *pt;
struct hlist_node *node;
int i = 1;
read_lock(&ax25_uid_lock); read_lock(&ax25_uid_lock);
return seq_hlist_start_head(&ax25_uid_list, *pos);
if (*pos == 0)
return SEQ_START_TOKEN;
ax25_uid_for_each(pt, node, &ax25_uid_list) {
if (i == *pos)
return pt;
++i;
}
return NULL;
} }
static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
++*pos; return seq_hlist_next(v, &ax25_uid_list, pos);
if (v == SEQ_START_TOKEN)
return ax25_uid_list.first;
else
return hlist_entry(((ax25_uid_assoc *)v)->uid_node.next,
ax25_uid_assoc, uid_node);
} }
static void ax25_uid_seq_stop(struct seq_file *seq, void *v) static void ax25_uid_seq_stop(struct seq_file *seq, void *v)
@@ -186,8 +168,9 @@ static int ax25_uid_seq_show(struct seq_file *seq, void *v)
if (v == SEQ_START_TOKEN) if (v == SEQ_START_TOKEN)
seq_printf(seq, "Policy: %d\n", ax25_uid_policy); seq_printf(seq, "Policy: %d\n", ax25_uid_policy);
else { else {
struct ax25_uid_assoc *pt = v; struct ax25_uid_assoc *pt;
pt = hlist_entry(v, struct ax25_uid_assoc, uid_node);
seq_printf(seq, "%6d %s\n", pt->uid, ax2asc(buf, &pt->call)); seq_printf(seq, "%6d %s\n", pt->uid, ax2asc(buf, &pt->call));
} }
return 0; return 0;