From patchwork Fri Aug 17 14:58:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 178240 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7FBC92C00AA for ; Sat, 18 Aug 2012 00:58:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758228Ab2HQO6v (ORCPT ); Fri, 17 Aug 2012 10:58:51 -0400 Received: from hotel311.server4you.de ([85.25.146.15]:33842 "EHLO hotel311.server4you.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756089Ab2HQO6Z (ORCPT ); Fri, 17 Aug 2012 10:58:25 -0400 Received: from candlejack.bmw-carit.intra (mail.bmw-carit.de [62.245.222.98]) (Authenticated sender: wagi) by hotel311.server4you.de (Postfix) with ESMTPSA id 8E583CBE109; Fri, 17 Aug 2012 16:58:14 +0200 (CEST) From: Daniel Wagner To: netdev@vger.kernel.org, cgroups@vger.kernel.org Cc: Daniel Wagner , Gao feng , Jamal Hadi Salim , John Fastabend , Li Zefan , Neil Horman , Tejun Heo Subject: [PATCH v1 2/5] cgroup: Move sock_update_classid() decleration to cls_cgroup.h Date: Fri, 17 Aug 2012 16:58:11 +0200 Message-Id: <1345215494-9181-3-git-send-email-wagi@monom.org> X-Mailer: git-send-email 1.7.12.rc1.16.g05a20c8 In-Reply-To: <1345215494-9181-1-git-send-email-wagi@monom.org> References: <1345215494-9181-1-git-send-email-wagi@monom.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Daniel Wagner The only user of sock_update_classid() is net/socket.c which happens to include cls_cgroup.h direclty. Signed-off-by: Daniel Wagner Cc: Gao feng Cc: Jamal Hadi Salim Cc: John Fastabend Cc: Li Zefan Cc: Neil Horman Cc: Tejun Heo Cc: netdev@vger.kernel.org Cc: cgroups@vger.kernel.org --- include/net/cls_cgroup.h | 8 ++++++++ include/net/sock.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index e2fe2b9..401672c 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -24,6 +24,8 @@ struct cgroup_cls_state u32 classid; }; +extern void sock_update_classid(struct sock *sk); + #if IS_BUILTIN(CONFIG_NET_CLS_CGROUP) static inline u32 task_cls_classid(struct task_struct *p) @@ -73,6 +75,12 @@ static inline u32 task_cls_classid(struct task_struct *p) #endif /* CONFIG_NET_CLS_CGROUP */ +#else /* !CONFIG_CGROUPS */ + +static inline void sock_update_classid(struct sock *sk) +{ +} + #endif /* CONFIG_CGROURPS */ #endif /* _NET_CLS_CGROUP_H */ diff --git a/include/net/sock.h b/include/net/sock.h index 72132ae..160a680 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -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.