From a77a20668cb84fb01a5e93eb346e441c0ff751df Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Mon, 10 Jan 2011 12:10:50 -0500
Subject: [PATCH] --- yaml --- r: 229119 b: refs/heads/master c:
 f9a62d090cf47fae2fe6f6bd8eb9f24482573fd8 h: refs/heads/master i:   229117:
 2e948c94529812f9160020180fed50a00c6e6934   229115:
 b5b6096cef50cac801c97838405e08d77fee0abc   229111:
 c58f6e9ada11c8f7bac9d38b58ac54f290dcd337   229103:
 e87700be7e28cbfc5dfc73d24b4350975421e5dc   229087:
 46ec34aca63c6c667d5b368577d7912e827ad68f   229055:
 70154d044ef8347b4beb1d317892e27e3df16b9c   228991:
 7cae01d5d5394acfb899ceee8b66d9531ee76f50   228863:
 40b41663b11443c2202cf53648e27f649b346462 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/super.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76a1cb7d8a2b..a126c6c33b62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13195184a8bc119dbd2f905db325a453047971cb
+refs/heads/master: f9a62d090cf47fae2fe6f6bd8eb9f24482573fd8
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index c228da112de0..d49e3b1ec41e 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -437,7 +437,7 @@ void ext4_error_file(struct file *file, const char *function,
 	save_error_info(inode->i_sb, function, line);
 	va_start(args, fmt);
 	path = d_path(&(file->f_path), pathname, sizeof(pathname));
-	if (!path)
+	if (IS_ERR(path))
 		path = "(unknown)";
 	printk(KERN_CRIT
 	       "EXT4-fs error (device %s): %s:%d: inode #%lu "