From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758086AbbEaD1o (ORCPT ); Sat, 30 May 2015 23:27:44 -0400 Received: from linuxhacker.ru ([217.76.32.60]:60309 "EHLO fiona.linuxhacker.ru" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757862AbbEaD11 (ORCPT ); Sat, 30 May 2015 23:27:27 -0400 From: green@linuxhacker.ru To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger Cc: Linux Kernel Mailing List , Dmitry Eremin Subject: [PATCH 2/6] staging/lustre/obd: remove unused proc_lustre_root Date: Sat, 30 May 2015 23:27:01 -0400 Message-Id: <1433042825-682-3-git-send-email-green@linuxhacker.ru> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433042825-682-1-git-send-email-green@linuxhacker.ru> References: <1433042825-682-1-git-send-email-green@linuxhacker.ru> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Eremin Signed-off-by: Dmitry Eremin --- drivers/staging/lustre/lustre/include/lprocfs_status.h | 3 --- .../lustre/lustre/obdclass/linux/linux-module.c | 18 ------------------ 2 files changed, 21 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h index 721efd6..19ab9e8 100644 --- a/drivers/staging/lustre/lustre/include/lprocfs_status.h +++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h @@ -349,7 +349,6 @@ enum { #define EXTRA_FIRST_OPC LDLM_GLIMPSE_ENQUEUE /* class_obd.c */ -extern struct proc_dir_entry *proc_lustre_root; extern struct dentry *debugfs_lustre_root; extern struct kobject *lustre_kobj; @@ -851,8 +850,6 @@ extern int lprocfs_quota_wr_qs_factor(struct file *file, #else /* CONFIG_PROC_FS is not defined */ -#define proc_lustre_root NULL - static inline void lprocfs_counter_add(struct lprocfs_stats *stats, int index, long amount) { return; } diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c index 03a982a..50c3d1d 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c @@ -322,11 +322,6 @@ static ssize_t jobid_name_store(struct kobject *kobj, struct attribute *attr, struct dentry *debugfs_lustre_root; EXPORT_SYMBOL_GPL(debugfs_lustre_root); -#if defined(CONFIG_PROC_FS) -/* Root for /proc/fs/lustre */ -struct proc_dir_entry *proc_lustre_root = NULL; -EXPORT_SYMBOL(proc_lustre_root); - LUSTRE_RO_ATTR(version); LUSTRE_RO_ATTR(pinger); LUSTRE_RO_ATTR(health); @@ -459,14 +454,6 @@ int class_procfs_init(void) kobject_put(lustre_kobj); goto out; } - - proc_lustre_root = lprocfs_register("fs/lustre", NULL, NULL, NULL); - if (IS_ERR(proc_lustre_root)) { - rc = PTR_ERR(proc_lustre_root); - proc_lustre_root = NULL; - kobject_put(lustre_kobj); - goto out; - } out: return rc; } @@ -478,12 +465,7 @@ int class_procfs_clean(void) debugfs_lustre_root = NULL; - if (proc_lustre_root) { - lprocfs_remove(&proc_lustre_root); - } - kobject_put(lustre_kobj); return 0; } -#endif /* CONFIG_PROC_FS */ -- 2.1.0