diff options
author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-10-25 06:16:58 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-26 09:40:50 +0200 |
commit | fd9a08a7b83074e34c13c6340f673f7a51f53489 (patch) | |
tree | d4678a07c825bb6dbe84b129b82c4efa93d5a474 /drivers/net/tun.c | |
parent | cgroup: net_cls: Remove rcu_read_lock/unlock (diff) | |
download | linux-fd9a08a7b83074e34c13c6340f673f7a51f53489.tar.xz linux-fd9a08a7b83074e34c13c6340f673f7a51f53489.zip |
cgroup: net_cls: Pass in task to sock_update_classid()
sock_update_classid() assumes that the update operation always are
applied on the current task. sock_update_classid() needs to know on
which tasks to work on in order to be able to migrate task between
cgroups using the struct cgroup_subsys attach() callback.
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Joe Perches <joe@perches.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <netdev@vger.kernel.org>
Cc: <cgroups@vger.kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 0873cdcf39be..e4858b20bf11 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -587,7 +587,7 @@ static struct sk_buff *tun_alloc_skb(struct tun_struct *tun, struct sk_buff *skb; int err; - sock_update_classid(sk); + sock_update_classid(sk, current); /* Under a page? Don't bother with paged skb. */ if (prepad + len < PAGE_SIZE || !linear) |