diff --git a/[refs] b/[refs]
index 87fd8c50f8d9..1d8ca76fb6fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 363383277081ce831642b72df40932ee05ce40a2
+refs/heads/master: 7ee2cb7f32b299c2b06a31fde155457203e4b7dd
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 370b190a09d1..89f98e9a024b 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1943,7 +1943,8 @@ int nfs_permission(struct inode *inode, int mask)
 		case S_IFREG:
 			/* NFSv4 has atomic_open... */
 			if (nfs_server_capable(inode, NFS_CAP_ATOMIC_OPEN)
-					&& (mask & MAY_OPEN))
+					&& (mask & MAY_OPEN)
+					&& !(mask & MAY_EXEC))
 				goto out;
 			break;
 		case S_IFDIR: