Skip to content

Commit

Permalink
cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h
Browse files Browse the repository at this point in the history
The only user of sock_update_classid() is net/socket.c which happens
to include cls_cgroup.h directly.

tj: Fix build breakage due to missing cls_cgroup.h inclusion in
    drivers/net/tun.c reported in linux-next by Stephen.

Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: John Fastabend <john.r.fastabend@intel.com>
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org
  • Loading branch information
Daniel Wagner authored and Tejun Heo committed Sep 14, 2012
1 parent 83b061f commit f341980
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
#include <net/sock.h>
#include <net/cls_cgroup.h>

#include <asm/uaccess.h>

Expand Down
6 changes: 6 additions & 0 deletions include/net/cls_cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ struct cgroup_cls_state
u32 classid;
};

extern void sock_update_classid(struct sock *sk);

#ifdef CONFIG_NET_CLS_CGROUP
static inline u32 task_cls_classid(struct task_struct *p)
{
Expand Down Expand Up @@ -62,6 +64,10 @@ static inline u32 task_cls_classid(struct task_struct *p)
}
#endif
#else
static inline void sock_update_classid(struct sock *sk)
{
}

static inline u32 task_cls_classid(struct task_struct *p)
{
return 0;
Expand Down
8 changes: 0 additions & 8 deletions include/net/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -1486,14 +1486,6 @@ extern void *sock_kmalloc(struct sock *sk, int size,
extern void sock_kfree_s(struct sock *sk, void *mem, int size);
extern void sk_send_sigurg(struct sock *sk);

#ifdef CONFIG_CGROUPS
extern void sock_update_classid(struct sock *sk);
#else
static inline void sock_update_classid(struct sock *sk)
{
}
#endif

/*
* Functions to fill in entries in struct proto_ops when a protocol
* does not implement a particular function.
Expand Down

0 comments on commit f341980

Please sign in to comment.