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;