From 6c034ecb40ec542252ce9468699a87e3a9135f2d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 23 May 2013 13:02:13 +0300
Subject: [PATCH] --- yaml --- r: 377679 b: refs/heads/master c:
 f28c06fa6f3d3215a1ba5e62ebc5ce7229d7a895 h: refs/heads/master i:   377677:
 d0594e64cb4202a39582e6a2f7ccab2fc3d7a15d   377675:
 1569347d97ce8b55ef9ee6fd9b2f0fa2ed6dd91d   377671:
 bdf309969e2bb72a5e57bd638de8b8fcf0b63932   377663:
 8398b23ecb7da41a2017f3aed3fa5f8772d6417c v: v3

---
 [refs]                   | 2 +-
 trunk/fs/f2fs/recovery.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 11677b00bdfe..03bfe1ae3e3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f6fd833e1857e79a363fb20497237367bcfb7ee
+refs/heads/master: f28c06fa6f3d3215a1ba5e62ebc5ce7229d7a895
diff --git a/trunk/fs/f2fs/recovery.c b/trunk/fs/f2fs/recovery.c
index dcd8e860aad3..0dd2ce1b492f 100644
--- a/trunk/fs/f2fs/recovery.c
+++ b/trunk/fs/f2fs/recovery.c
@@ -71,7 +71,8 @@ static int recover_dentry(struct page *ipage, struct inode *inode)
 out:
 	f2fs_msg(inode->i_sb, KERN_NOTICE, "recover_inode and its dentry: "
 			"ino = %x, name = %s, dir = %lx, err = %d",
-			ino_of_node(ipage), raw_inode->i_name, dir->i_ino, err);
+			ino_of_node(ipage), raw_inode->i_name,
+			IS_ERR(dir) ? 0 : dir->i_ino, err);
 	return err;
 }