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

Commit c95aaf9a authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[IPV4] fib_trie: Fix sparse warnings. 



Make FIB TRIE go through sparse checker without warnings.

Signed-off-by: default avatarStephen Hemminger <stephen.hemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66a2f7fd

net/ipv4/fib_trie.c

+4 −3
Original line number Diff line number Diff line
@@ -653,7 +653,6 @@ static struct node *resize(struct trie *t, struct tnode *tn) 


static struct tnode *inflate(struct trie *t, struct tnode *tn)

{

	struct tnode *inode;

	struct tnode *oldtnode = tn;

	int olen = tnode_child_length(tn);

	int i;
@@ -701,6 +700,7 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn) 
	}



	for (i = 0; i < olen; i++) {

		struct tnode *inode;

		struct node *node = tnode_get_child(oldtnode, i);

		struct tnode *left, *right;

		int size, j;
@@ -1037,8 +1037,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen) 
	/* Case 1: n is a leaf. Compare prefixes */



	if (n != NULL && IS_LEAF(n) && tkey_equals(key, n->key)) {

		struct leaf *l = (struct leaf *) n;



		l = (struct leaf *) n;

		li = leaf_info_new(plen);



		if (!li)
@@ -2234,6 +2233,7 @@ static struct node *fib_trie_get_idx(struct fib_trie_iter *iter, 
}



static void *fib_trie_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(RCU)

{

	struct fib_trie_iter *iter = seq->private;

	struct fib_table *tb;
@@ -2276,6 +2276,7 @@ static void *fib_trie_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void fib_trie_seq_stop(struct seq_file *seq, void *v)

	__releases(RCU)

{

	rcu_read_unlock();

}