Commit 61308050 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: ipv6: use the new fib6_nh_release_dsts helper in fib6_nh_release 



We can remove a bit of code duplication by reusing the new
fib6_nh_release_dsts helper in fib6_nh_release. Their only difference is
that fib6_nh_release's version doesn't use atomic operation to swap the
pointers because it assumes the fib6_nh is no longer visible, while
fib6_nh_release_dsts can be used anywhere.

Suggested-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7709efa6

net/ipv6/route.c

+2 −18
Original line number Diff line number Diff line
@@ -3656,24 +3656,8 @@ void fib6_nh_release(struct fib6_nh *fib6_nh) 


	rcu_read_unlock();



	if (fib6_nh->rt6i_pcpu) {

		int cpu;



		for_each_possible_cpu(cpu) {

			struct rt6_info **ppcpu_rt;

			struct rt6_info *pcpu_rt;



			ppcpu_rt = per_cpu_ptr(fib6_nh->rt6i_pcpu, cpu);

			pcpu_rt = *ppcpu_rt;

			if (pcpu_rt) {

				dst_dev_put(&pcpu_rt->dst);

				dst_release(&pcpu_rt->dst);

				*ppcpu_rt = NULL;

			}

		}



	fib6_nh_release_dsts(fib6_nh);

	free_percpu(fib6_nh->rt6i_pcpu);

	}



	fib_nh_common_release(&fib6_nh->nh_common);

}