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

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

[IPV4] fib_trie: fib_insert_node cleanup 



The only error from fib_insert_node is if memory allocation fails, so
instead of passing by reference, just use the convention of returning
NULL.

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

net/ipv4/fib_trie.c

+11 −17
Original line number Diff line number Diff line
@@ -980,8 +980,7 @@ static struct node *trie_rebalance(struct trie *t, struct tnode *tn) 


/* only used from updater-side */



static  struct list_head *

fib_insert_node(struct trie *t, int *err, u32 key, int plen)

static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)

{

	int pos, newpos;

	struct tnode *tp = NULL, *tn = NULL;
@@ -1043,10 +1042,8 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) 


		li = leaf_info_new(plen);



		if (!li) {

			*err = -ENOMEM;

			goto done;

		}

		if (!li)

			return NULL;



		fa_head = &li->falh;

		insert_leaf_info(&l->list, li);
@@ -1055,18 +1052,15 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) 
	t->size++;

	l = leaf_new();



	if (!l) {

		*err = -ENOMEM;

		goto done;

	}

	if (!l)

		return NULL;



	l->key = key;

	li = leaf_info_new(plen);



	if (!li) {

		tnode_free((struct tnode *) l);

		*err = -ENOMEM;

		goto done;

		return NULL;

	}



	fa_head = &li->falh;
@@ -1102,8 +1096,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen) 
		if (!tn) {

			free_leaf_info(li);

			tnode_free((struct tnode *) l);

			*err = -ENOMEM;

			goto done;

			return NULL;

		}



		node_set_parent((struct node *)tn, tp);
@@ -1262,11 +1255,12 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) 
	 */



	if (!fa_head) {

		err = 0;

		fa_head = fib_insert_node(t, &err, key, plen);

		if (err)

		fa_head = fib_insert_node(t, key, plen);

		if (unlikely(!fa_head)) {

			err = -ENOMEM;

			goto out_free_new_fa;

		}

	}



	list_add_tail_rcu(&new_fa->fa_list,

			  (fa ? &fa->fa_list : fa_head));