From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dmitry Eremin <dmiter4ever@gmail.com>
Subject: [PATCH 2/6] staging/lustre/obd: remove unused proc_lustre_root
Date: Sat, 30 May 2015 23:27:01 -0400 [thread overview]
Message-ID: <1433042825-682-3-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1433042825-682-1-git-send-email-green@linuxhacker.ru>
From: Dmitry Eremin <dmiter4ever@gmail.com>
Signed-off-by: Dmitry Eremin <dmiter4ever@gmail.com>
---
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
next prev parent reply other threads:[~2015-05-31 3:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-31 3:26 [PATCH 0/6] Final part of lustre procfs removal series green
2015-05-31 3:27 ` [PATCH 1/6] staging/lustre/llite: Move all remaining procfs entries to debugfs green
2015-05-31 3:27 ` green [this message]
2015-05-31 3:27 ` [PATCH 3/6] staging/lustre/obd: Rename lprocfs_add_symlink to ldebugfs_add_symlink green
2015-05-31 3:27 ` [PATCH 4/6] staging/lustre/obd: remove unused lprocfs_exp_setup() and related functions green
2015-05-31 3:27 ` [PATCH 5/6] staging/lustre/obd: Remove nid_stats tracking green
2015-05-31 3:27 ` [PATCH 6/6] staging/lustre/obd: final removal of procfs stuff green
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433042825-682-3-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=dmiter4ever@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox