summaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorShen Feng <shen@cn.fujitsu.com>2008-07-14 01:03:31 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2008-07-14 01:03:31 (GMT)
commitcfbe7e4f5e4a0e1fc2ff23b167bfb3fa992f623d (patch)
treef1bb120c742d88e9a362d6cc142f0f855d47cd12 /fs/ext4
parentf795e1407343ebe6597653f4a6a7f770676e84c5 (diff)
downloadlinux-cfbe7e4f5e4a0e1fc2ff23b167bfb3fa992f623d.tar.xz
ext4: error proc entry creation when the fs/ext4 is not correctly created
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 <shen@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/mballoc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 21ee6d4..771a1d6 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2661,6 +2661,10 @@ static int ext4_mb_init_per_dev_proc(struct super_block *sb)
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);