From 23784c8b4a6899c189f59addedff239848109391 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Tue, 28 Dec 2010 17:02:46 +0000
Subject: [PATCH] --- yaml --- r: 229209 b: refs/heads/master c:
 bf0c84f1614bffc59565d04f09b9ac6b1aa269a9 h: refs/heads/master i:   229207:
 5e75c786883597054778bfc5a7f389a1c1d117a2 v: v3

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

diff --git a/[refs] b/[refs]
index 84958d57f439..e15dad1eecb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f3e97c9ee6290befb5a2e78baf95ff951a8a34a
+refs/heads/master: bf0c84f1614bffc59565d04f09b9ac6b1aa269a9
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 3e2123fe79f5..831d61c4449b 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1218,7 +1218,7 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
 		goto out_unblock_sillyrename;
 	}
 	inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
-	res = (struct dentry *)inode;
+	res = ERR_CAST(inode);
 	if (IS_ERR(res))
 		goto out_unblock_sillyrename;