diff options
| author | Tejun Heo | 2015-12-07 23:38:52 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-09 04:02:33 +0100 |
| commit | 2a56a1fec290bf0bc4676bbf4efdb3744953a3e7 (patch) | |
| tree | c02ca93b96c4fa2c8aacf24f72f63d861794e567 /net/netfilter/nft_meta.c | |
| parent | netprio_cgroup: limit the maximum css->id to USHRT_MAX (diff) | |
| download | kernel-qcow2-linux-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.tar.gz kernel-qcow2-linux-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.tar.xz kernel-qcow2-linux-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.zip | |
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
Introduce sock->sk_cgrp_data which is a struct sock_cgroup_data.
->sk_cgroup_prioidx and ->sk_classid are moved into it. The struct
and its accessors are defined in cgroup-defs.h. This is to prepare
for overloading the fields with a cgroup pointer.
This patch mostly performs equivalent conversions but the followings
are noteworthy.
* Equality test before updating classid is removed from
sock_update_classid(). This shouldn't make any noticeable
difference and a similar test will be implemented on the helper side
later.
* sock_update_netprioidx() now takes struct sock_cgroup_data and can
be moved to netprio_cgroup.h without causing include dependency
loop. Moved.
* The dummy version of sock_update_netprioidx() converted to a static
inline function while at it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_meta.c')
| -rw-r--r-- | net/netfilter/nft_meta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 9dfaf4d55ee0..1915cab7f32d 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -174,7 +174,7 @@ void nft_meta_get_eval(const struct nft_expr *expr, sk = skb_to_full_sk(skb); if (!sk || !sk_fullsock(sk)) goto err; - *dest = sk->sk_classid; + *dest = sock_cgroup_classid(&sk->sk_cgrp_data); break; #endif default: |