diff --git a/[refs] b/[refs]
index 5815aa42a835..2ded59871e85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a47970ff7814718fec31b7d966747c6aa1a3545f
+refs/heads/master: f6488c9ba51d65410e2dbc4345413c0d9120971e
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 6acc73c80d7f..f52c99f4785b 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -237,6 +237,8 @@ nfs_find_actor(struct inode *inode, void *opaque)
 
 	if (NFS_FILEID(inode) != fattr->fileid)
 		return 0;
+	if ((S_IFMT & inode->i_mode) != (S_IFMT & fattr->mode))
+		return 0;
 	if (nfs_compare_fh(NFS_FH(inode), fh))
 		return 0;
 	if (is_bad_inode(inode) || NFS_STALE(inode))