2008-09-22 21:08:09

by Andrew Morton

[permalink] [raw]
Subject: [patch for 2.6.27? 1/1] ext4: create /proc/ext4/*/stats et al more carefully

From: Alexey Dobriyan <[email protected]>

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11321

ext4 creates per-suberblock directory in /proc/ext4/ . Name used as basis
is taken from bdevname, which, surprise, can contain slash.

However, proc while allowing to use proc_create("a/b", parent) form of
PDE creation, assumes that parent/a was already created.

bdevname in question is 'cciss/c0d0p9', directory is not created and all
this stuff goes directly into /proc (which is real bug).

Warning comes when _second_ partition is mounted.

Signed-off-by: Alexey Dobriyan <[email protected]>
Reported-by: Ralf Hildebrandt <[email protected]>
Tested-by: Ralf Hildebrandt <[email protected]>
Cc: Andreas Dilger <[email protected]>
Cc: Theodore Ts'o <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

fs/ext4/mballoc.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff -puN fs/ext4/mballoc.c~ext4-fix-11321-create-proc-ext4-stats-et-al-more-carefully fs/ext4/mballoc.c
--- a/fs/ext4/mballoc.c~ext4-fix-11321-create-proc-ext4-stats-et-al-more-carefully
+++ a/fs/ext4/mballoc.c
@@ -2792,6 +2792,15 @@ static int ext4_mb_init_per_dev_proc(str
return -EINVAL;
}
bdevname(sb->s_bdev, devname);
+ {
+ char *p = devname;
+
+ while (*p != '\0') {
+ if (*p == '/')
+ *p = '!';
+ p++;
+ }
+ }
sbi->s_mb_proc = proc_mkdir(devname, proc_root_ext4);

MB_PROC_HANDLER(EXT4_MB_STATS_NAME, stats);
_