Commit e550785c authored Feb 17, 2016 by Benjamin Poirier Committed by David S. Miller Feb 18, 2016

ipv6: Annotate change of locking mechanism for np->opt



follows up commit 45f6fad8 ("ipv6: add complete rcu protection around
np->opt") which added mixed rcu/refcount protection to np->opt.

Given the current implementation of rcu_pointer_handoff(), this has no
effect at runtime.

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f0a40450

include/net/ipv6.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -259,8 +259,12 @@ static inline struct ipv6_txoptions txopt_get(const struct ipv6_pinfo np)

		rcu_read_lock();
		opt = rcu_dereference(np->opt);
		if (opt && !atomic_inc_not_zero(&opt->refcnt))
		if (opt) {
		if (!atomic_inc_not_zero(&opt->refcnt))
		opt = NULL;
		else
		opt = rcu_pointer_handoff(opt);
		}
		rcu_read_unlock();
		return opt;
		}

Admin message