2008-07-13 06:26:38

by Andrew Morton

Subject: [patch 1/4] ext4: error proc entry creation when the fs/ext4 is not correctly created

From: Shen Feng <[email protected]>

When the directory fs/ext4 is not correctly created under proc, the entry
under this directory should not be created.

Signed-off-by: Shen Feng <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

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

diff -puN fs/ext4/mballoc.c~ext4-error-proc-entry-creation-when-the-fs-ext4-is-not-correctly-created fs/ext4/mballoc.c
--- a/fs/ext4/mballoc.c~ext4-error-proc-entry-creation-when-the-fs-ext4-is-not-correctly-created
+++ a/fs/ext4/mballoc.c
@@ -2785,6 +2785,10 @@ static int ext4_mb_init_per_dev_proc(str
struct proc_dir_entry *proc;
char devname[64];

+ if (proc_root_ext4 == NULL) {
+ sbi->s_mb_proc = NULL;
+ return -EINVAL;
+ }
bdevname(sb->s_bdev, devname);
sbi->s_mb_proc = proc_mkdir(devname, proc_root_ext4);

_

2008-07-14 01:08:20

by Theodore Ts'o

Subject: Re: [patch 1/4] ext4: error proc entry creation when the fs/ext4 is not correctly created

On Sat, Jul 12, 2008 at 11:26:19PM -0700, [email protected] wrote:
> From: Shen Feng <[email protected]>
>
> When the directory fs/ext4 is not correctly created under proc, the entry
> under this directory should not be created.
>
> Signed-off-by: Shen Feng <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>

Thanks, applied.

- Ted