Skip to contentSkip to conversation

fib6_del_route has redundant code

DISCUSSION Gui Jianfeng 2 participants 5 messages Dec 27, 2007 – Dec 28, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi all,
I think the following code in fib6_del_route in the latest kernel is useless.
1125 if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
1126 fn->leaf = &ip6_null_entry;

ip6_null_entry will never be unlinked from fn->leaf now, that is, fn->leaf == NULL will never meet.

In previous kernel, When adding a default route, ip6_null_entry will be unlinked from fn->leaf. So, when deleting a default route, it need to check whether the deleted route is the last one, if so, ip6_null_entry will link to fn->leaf again.

I am not sure if there is another place unlinks ip6_null_entry from fn->leaf.

Regards,
Gui Jiafeng

maintainer
#1 lore raw

From: Gui Jianfeng <[email protected]>
Date: Thu, 27 Dec 2007 15:26:46 +0800

Quoted 6 lines

I think the following code in fib6_del_route in the latest kernel is useless.
1125 if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
1126 fn->leaf = &ip6_null_entry;

ip6_null_entry will never be unlinked from fn->leaf now, that is, fn->leaf == NULL will never meet.

I think you are right, but if it is true the next block of code is dead too:

	/* If it was last route, expunge its radix tree node */
	if (fn->leaf == NULL) {
		fn->fn_flags &= ~RTN_RTINFO;
		rt6_stats.fib_route_nodes--;
		fn = fib6_repair_tree(fn);
	}

But I am not completely convinced that all of these lines of code can be removed :-)

#2 lore raw
Quoted 10 lines
Quoted 6 lines

I think the following code in fib6_del_route in the latest kernel is useless.
1125 if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
1126 fn->leaf = &ip6_null_entry;

ip6_null_entry will never be unlinked from fn->leaf now, that is, fn->leaf == NULL will never meet.

I think you are right, but if it is true the next block of code is dead too:

Quoted 7 lines
	/* If it was last route, expunge its radix tree node */
	if (fn->leaf == NULL) {
		fn->fn_flags &= ~RTN_RTINFO;
		rt6_stats.fib_route_nodes--;
		fn = fib6_repair_tree(fn);
	}

Dave,

I think this block of code can't be removed, because just the root(default route) fn->leaf always has ip6_null_entry on it. The normal fn->leaf becomes NULL when last route has been deleted, the radix tree should be expunged.

Quoted 4 lines

But I am not completely convinced that all of these lines of code can be removed :-)

Signature · 13 lines
Regards
Gui Jianfeng
--------------------------------------------------
Gui Jianfeng
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
8/F., Civil Defense Building, No.189 Guangzhou Road,
Nanjing, 210029, China
TEL: +86+25-86630566-838
COINS: 79955-838
FAX: +86+25-83317685
MAIL:[email protected]
--------------------------------------------------
maintainer
#3 lore raw

From: Gui Jianfeng <[email protected]>
Date: Fri, 28 Dec 2007 13:58:21 +0800

Quoted 18 lines
Quoted 10 lines
Quoted 6 lines

I think the following code in fib6_del_route in the latest kernel is useless.
1125 if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
1126 fn->leaf = &ip6_null_entry;

ip6_null_entry will never be unlinked from fn->leaf now, that is, fn->leaf == NULL will never meet.

I think you are right, but if it is true the next block of code is dead too:

Quoted 7 lines
	/* If it was last route, expunge its radix tree node */
	if (fn->leaf == NULL) {
		fn->fn_flags &= ~RTN_RTINFO;
		rt6_stats.fib_route_nodes--;
		fn = fib6_repair_tree(fn);
	}
Quoted 4 lines

I think this block of code can't be removed, because just the root(default route) fn->leaf always has ip6_null_entry on it. The normal fn->leaf becomes NULL when last route has been deleted, the radix tree should be expunged.

But you said (still quoted above) that fn->leaf == NULL will not occur.

Do you mean this, only in the case that the RTN_TL_ROOT flag is set?

I thought you meant always when the function is called, fn->leaf cannot ever be NULL.

#4 lore raw
Quoted 24 lines

From: Gui Jianfeng <[email protected]>
Date: Fri, 28 Dec 2007 13:58:21 +0800

Quoted 16 lines
Quoted 9 lines
Quoted 6 lines

I think the following code in fib6_del_route in the latest kernel is useless.
1125 if (fn->leaf == NULL && fn->fn_flags&RTN_TL_ROOT)
1126 fn->leaf = &ip6_null_entry;

ip6_null_entry will never be unlinked from fn->leaf now, that is, fn->leaf == NULL will never meet.

I think you are right, but if it is true the next block of code is dead too:

Quoted 7 lines
	/* If it was last route, expunge its radix tree node */
	if (fn->leaf == NULL) {
		fn->fn_flags &= ~RTN_RTINFO;
		rt6_stats.fib_route_nodes--;
		fn = fib6_repair_tree(fn);
	}
Quoted 4 lines

I think this block of code can't be removed, because just the root(default route) fn->leaf always has ip6_null_entry on it. The normal fn->leaf becomes NULL when last route has been deleted, the radix tree should be expunged.

Quoted 4 lines

But you said (still quoted above) that fn->leaf == NULL will not occur.

Do you mean this, only in the case that the RTN_TL_ROOT flag is set?

yes, I mean this :-)

Quoted 3 lines

I thought you meant always when the function is called, fn->leaf cannot ever be NULL.

its my fault, sorry for the inconvenient.

Quoted 3 lines