From: Yargil <yargil@free.fr>
To: linux-ext4@vger.kernel.org
Cc: Yargil <yargil@free.fr>
Subject: [PATCH] ext4: don't work without procfs
Date: Mon, 3 Oct 2011 22:46:01 +0200 [thread overview]
Message-ID: <1317674761-17837-1-git-send-email-yargil@free.fr> (raw)
Regression from commit dd68314ccf3fb918c1fb6471817edbc60ece4b52
---
fs/ext4/super.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 44d0c8d..8e7298d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -53,7 +53,9 @@
#define CREATE_TRACE_POINTS
#include <trace/events/ext4.h>
+#ifdef CONFIG_PROC_FS
static struct proc_dir_entry *ext4_proc_root;
+#endif
static struct kset *ext4_kset;
static struct ext4_lazy_init *ext4_li_info;
static struct mutex ext4_li_mtx;
@@ -812,9 +814,11 @@ static void ext4_put_super(struct super_block *sb)
es->s_state = cpu_to_le16(sbi->s_mount_state);
ext4_commit_super(sb, 1);
}
+#ifdef CONFIG_PROC_FS
if (sbi->s_proc) {
remove_proc_entry(sb->s_id, ext4_proc_root);
}
+#endif
kobject_del(&sbi->s_kobj);
for (i = 0; i < sbi->s_gdb_count; i++)
@@ -4984,9 +4988,11 @@ static int __init ext4_init_fs(void)
ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
if (!ext4_kset)
goto out6;
+#ifdef CONFIG_PROC_FS
ext4_proc_root = proc_mkdir("fs/ext4", NULL);
if (!ext4_proc_root)
goto out5;
+#endif
err = ext4_init_feat_adverts();
if (err)
@@ -5022,8 +5028,10 @@ out2:
out3:
ext4_exit_feat_adverts();
out4:
+#ifdef CONFIG_PROC_FS
remove_proc_entry("fs/ext4", NULL);
out5:
+#endif
kset_unregister(ext4_kset);
out6:
ext4_exit_system_zone();
--
1.7.2.5
next reply other threads:[~2011-10-03 20:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-03 20:46 Yargil [this message]
2011-10-04 9:20 ` [PATCH] ext4: don't work without procfs Lukas Czerner
2011-10-04 11:03 ` yargil
2011-10-04 11:33 ` Lukas Czerner
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=1317674761-17837-1-git-send-email-yargil@free.fr \
--to=yargil@free.fr \
--cc=linux-ext4@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