From patchwork Mon Feb 18 11:34:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 221261 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 9F0F92C007A for ; Mon, 18 Feb 2013 22:34:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098Ab3BRLe0 (ORCPT ); Mon, 18 Feb 2013 06:34:26 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:15552 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751368Ab3BRLeZ (ORCPT ); Mon, 18 Feb 2013 06:34:25 -0500 X-IronPort-AV: E=Sophos;i="4.84,687,1355068800"; d="scan'208";a="6724293" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 18 Feb 2013 19:32:05 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r1IBYMEs006089; Mon, 18 Feb 2013 19:34:22 +0800 Received: from Donkey.fnst.cn.fujitsu.com ([10.167.225.206]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013021819334569-216085 ; Mon, 18 Feb 2013 19:33:45 +0800 From: Gao feng To: netdev@vger.kernel.org Cc: ebiederm@xmission.com, davem@davemloft.net, containers@lists.linux-foundation.org, Gao feng Subject: [PATCH net-next 2/4] net: proc: remove proc_net_fops_create Date: Mon, 18 Feb 2013 19:34:55 +0800 Message-Id: <1361187297-2527-2-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1361187297-2527-1-git-send-email-gaofeng@cn.fujitsu.com> References: <1361187297-2527-1-git-send-email-gaofeng@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/18 19:33:45, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/18 19:33:46, Serialize complete at 2013/02/18 19:33:46 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org proc_net_fops_create has been replaced by proc_create, we can remove it now. Signed-off-by: Gao feng --- fs/proc/proc_net.c | 8 -------- include/linux/proc_fs.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c index fe72cd0..30f7c67 100644 --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -177,14 +177,6 @@ const struct file_operations proc_net_operations = { .readdir = proc_tgid_net_readdir, }; - -struct proc_dir_entry *proc_net_fops_create(struct net *net, - const char *name, umode_t mode, const struct file_operations *fops) -{ - return proc_create(name, mode, net->proc_net, fops); -} -EXPORT_SYMBOL_GPL(proc_net_fops_create); - void proc_net_remove(struct net *net, const char *name) { remove_proc_entry(name, net->proc_net); diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 32676b3..35ee189 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -171,8 +171,6 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name, return res; } -extern struct proc_dir_entry *proc_net_fops_create(struct net *net, - const char *name, umode_t mode, const struct file_operations *fops); extern void proc_net_remove(struct net *net, const char *name); extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, struct proc_dir_entry *parent); @@ -184,7 +182,6 @@ extern int proc_alloc_inum(unsigned int *pino); extern void proc_free_inum(unsigned int inum); #else -#define proc_net_fops_create(net, name, mode, fops) ({ (void)(mode), NULL; }) static inline void proc_net_remove(struct net *net, const char *name) {} static inline void proc_flush_task(struct task_struct *task)