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 "