From patchwork Thu Jan 21 19:01:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 571302 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 012B41402CD for ; Fri, 22 Jan 2016 06:02:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759746AbcAUTBz (ORCPT ); Thu, 21 Jan 2016 14:01:55 -0500 Received: from gum.cmpxchg.org ([85.214.110.215]:53932 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752770AbcAUTBy (ORCPT ); Thu, 21 Jan 2016 14:01:54 -0500 From: Johannes Weiner To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: sock: remove dead cgroup methods from struct proto Date: Thu, 21 Jan 2016 14:01:11 -0500 Message-Id: <1453402871-2548-1-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 2.7.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The cgroup methods are no longer used after baac50b ("net: tcp_memcontrol: simplify linkage between socket and page counter"). The hunk to delete them was included in the original patch but must have gotten lost during conflict resolution on the way upstream. Fixes: baac50b ("net: tcp_memcontrol: simplify linkage between socket and page counter") Signed-off-by: Johannes Weiner --- include/net/sock.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index b9e7b3d..f5ea148 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1036,18 +1036,6 @@ struct proto { #ifdef SOCK_REFCNT_DEBUG atomic_t socks; #endif -#ifdef CONFIG_MEMCG_KMEM - /* - * cgroup specific init/deinit functions. Called once for all - * protocols that implement it, from cgroups populate function. - * This function has to setup any files the protocol want to - * appear in the kmem cgroup filesystem. - */ - int (*init_cgroup)(struct mem_cgroup *memcg, - struct cgroup_subsys *ss); - void (*destroy_cgroup)(struct mem_cgroup *memcg); - struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg); -#endif int (*diag_destroy)(struct sock *sk, int err); };