From patchwork Fri Sep 14 14:33:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 183941 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 1468A2C0081 for ; Sat, 15 Sep 2012 00:33:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757859Ab2INOdQ (ORCPT ); Fri, 14 Sep 2012 10:33:16 -0400 Received: from hotel311.server4you.de ([85.25.146.15]:35474 "EHLO hotel311.server4you.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757454Ab2INOdH (ORCPT ); Fri, 14 Sep 2012 10:33:07 -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 74CD2CBE11A; Fri, 14 Sep 2012 16:33:03 +0200 (CEST) From: Daniel Wagner To: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Cc: Daniel Wagner , Gao feng , Jamal Hadi Salim , John Fastabend , Neil Horman , Stephen Rothwell , netdev@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH v6] cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h Date: Fri, 14 Sep 2012 16:33:03 +0200 Message-Id: <1347633184-26837-2-git-send-email-wagi@monom.org> X-Mailer: git-send-email 1.7.12.315.g682ce8b In-Reply-To: <1347633184-26837-1-git-send-email-wagi@monom.org> References: <1347633184-26837-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 two users of sock_update_classid() are net/socket.c and drivers/net/tun.c. socket.c includes cls_cgroup.h already. Update tun.c to inlcude the header. Signed-off-by: Daniel Wagner Acked-by: Tejun Heo Acked-by: Li Zefan Cc: Gao feng Cc: Jamal Hadi Salim Cc: John Fastabend Cc: Neil Horman Cc: Stephen Rothwell Cc: netdev@vger.kernel.org Cc: cgroups@vger.kernel.org --- This patch is an updated version of the faulty one. drivers/net/tun.c | 1 + include/net/cls_cgroup.h | 6 ++++++ include/net/sock.h | 8 -------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3a16d4f..9336b82 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -68,6 +68,7 @@ #include #include #include +#include #include diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index a4dc5b0..e88527a 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); + #ifdef CONFIG_NET_CLS_CGROUP static inline u32 task_cls_classid(struct task_struct *p) { @@ -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; 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.