GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfrm: policy: remove xfrm_policy_put_afinfo

Browse source 
Alternative is to keep it an make the (unused) afinfo arg const to avoid
the compiler warnings once the afinfo structs get constified.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Florian Westphal 2017-02-07 15:00:18 +01:00 • committed by Steffen Klassert
parent a2817d8b27
commit bdba9fe01e
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
net/xfrm/xfrm_policy.c
View file

@ -116,11 +116,6 @@ static const struct xfrm_policy_afinfo *xfrm_policy_get_afinfo(unsigned short fa
return afinfo; return afinfo;
} }
static void xfrm_policy_put_afinfo(struct xfrm_policy_afinfo *afinfo)
{
rcu_read_unlock();
}
static inline struct dst_entry *__xfrm_dst_lookup(struct net *net, static inline struct dst_entry *__xfrm_dst_lookup(struct net *net,
int tos, int oif, int tos, int oif,
const xfrm_address_t *saddr, const xfrm_address_t *saddr,
@ -136,7 +131,7 @@ static inline struct dst_entry *__xfrm_dst_lookup(struct net *net,
dst = afinfo->dst_lookup(net, tos, oif, saddr, daddr); dst = afinfo->dst_lookup(net, tos, oif, saddr, daddr);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return dst; return dst;
} }
@ -1436,7 +1431,7 @@ xfrm_get_saddr(struct net *net, int oif, xfrm_address_t *local,
if (unlikely(afinfo == NULL)) if (unlikely(afinfo == NULL))
return -EINVAL; return -EINVAL;
err = afinfo->get_saddr(net, oif, local, remote); err = afinfo->get_saddr(net, oif, local, remote);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return err; return err;
} }
@ -1546,7 +1541,7 @@ static int xfrm_get_tos(const struct flowi *fl, int family)
afinfo = xfrm_policy_get_afinfo(family); afinfo = xfrm_policy_get_afinfo(family);
tos = afinfo ? afinfo->get_tos(fl) : 0; tos = afinfo ? afinfo->get_tos(fl) : 0;
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return tos; return tos;
} }
@ -1632,7 +1627,7 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
} else } else
xdst = ERR_PTR(-ENOBUFS); xdst = ERR_PTR(-ENOBUFS);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return xdst; return xdst;
} }
@ -1649,7 +1644,7 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,
err = afinfo->init_path(path, dst, nfheader_len); err = afinfo->init_path(path, dst, nfheader_len);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return err; return err;
} }
@ -1666,7 +1661,7 @@ static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
err = afinfo->fill_dst(xdst, dev, fl); err = afinfo->fill_dst(xdst, dev, fl);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return err; return err;
} }
@ -2215,7 +2210,7 @@ static struct dst_entry *make_blackhole(struct net *net, u16 family,
} else { } else {
ret = afinfo->blackhole_route(net, dst_orig); ret = afinfo->blackhole_route(net, dst_orig);
} }
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return ret; return ret;
} }
@ -2465,7 +2460,7 @@ int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl,
afinfo->decode_session(skb, fl, reverse); afinfo->decode_session(skb, fl, reverse);
err = security_xfrm_decode_session(skb, &fl->flowi_secid); err = security_xfrm_decode_session(skb, &fl->flowi_secid);
xfrm_policy_put_afinfo(afinfo); rcu_read_unlock();
return err; return err;
} }
EXPORT_SYMBOL(__xfrm_decode_session); EXPORT_SYMBOL(__xfrm_decode_session);