Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b512f3d8 authored by Li Zefan's avatar Li Zefan Committed by David S. Miller
Browse files

net: ax25: use seq_hlist_foo() helpers 



Simplify seq_file code.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90dd7f5a

net/ax25/af_ax25.c

+3 −15
Original line number Diff line number Diff line
@@ -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)

	__acquires(ax25_list_lock)

{

	struct ax25_cb *ax25;

	struct hlist_node *node;

	int i = 0;



	spin_lock_bh(&ax25_list_lock);

	ax25_for_each(ax25, node, &ax25_list) {

		if (i == *pos)

			return ax25;

		++i;

	}

	return NULL;

	return seq_hlist_start(&ax25_list, *pos);

}



static void *ax25_info_next(struct seq_file *seq, void *v, loff_t *pos)

{

	++*pos;



	return hlist_entry( ((struct ax25_cb *)v)->ax25_node.next,

			    struct ax25_cb, ax25_node);

	return seq_hlist_next(v, &ax25_list, pos);

}



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)

{

	ax25_cb *ax25 = v;

	ax25_cb *ax25 = hlist_entry(v, struct ax25_cb, ax25_node);

	char buf[11];

	int k;

net/ax25/ax25_uid.c

+4 −21
Original line number Diff line number Diff line
@@ -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)

	__acquires(ax25_uid_lock)

{

	struct ax25_uid_assoc *pt;

	struct hlist_node *node;

	int i = 1;



	read_lock(&ax25_uid_lock);



	if (*pos == 0)

		return SEQ_START_TOKEN;



	ax25_uid_for_each(pt, node, &ax25_uid_list) {

		if (i == *pos)

			return pt;

		++i;

	}

	return NULL;

	return seq_hlist_start_head(&ax25_uid_list, *pos);

}



static void *ax25_uid_seq_next(struct seq_file *seq, void *v, loff_t *pos)

{

	++*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);

	return seq_hlist_next(v, &ax25_uid_list, pos);

}



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)

		seq_printf(seq, "Policy: %d\n", ax25_uid_policy);

	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));

	}

	return 0;