From becef1a0d5c2af90c1e77713a0411d10df7c7f44 Mon Sep 17 00:00:00 2001
From: Shen Feng <shen@cn.fujitsu.com>
Date: Sun, 13 Jul 2008 21:03:31 -0400
Subject: [PATCH] --- yaml --- r: 101081 b: refs/heads/master c:
 cfbe7e4f5e4a0e1fc2ff23b167bfb3fa992f623d h: refs/heads/master i:   101079:
 e655ca9a08a828ed2fdc2bd3ff5ba1f25b141e4c v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13adf0e3d60e..77613cc6d6d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f795e1407343ebe6597653f4a6a7f770676e84c5
+refs/heads/master: cfbe7e4f5e4a0e1fc2ff23b167bfb3fa992f623d
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index 21ee6d42ee7b..771a1d608528 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/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);