net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
authorTejun Heo <tj@kernel.org>
Mon, 7 Dec 2015 22:38:52 +0000 (17:38 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 03:02:33 +0000 (22:02 -0500)
commit2a56a1fec290bf0bc4676bbf4efdb3744953a3e7
treec02ca93b96c4fa2c8aacf24f72f63d861794e567
parent297dbde19cf6a0ccb6fd4396c6220a5912ed61e8
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>
12 files changed:
include/linux/cgroup-defs.h
include/net/cls_cgroup.h
include/net/netprio_cgroup.h
include/net/sock.h
net/Kconfig
net/core/dev.c
net/core/netclassid_cgroup.c
net/core/netprio_cgroup.c
net/core/scm.c
net/core/sock.c
net/netfilter/nft_meta.c
net/netfilter/xt_cgroup.c