X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fnfs%2Fdir.c;h=89f98e9a024b73accbfce55d575834e9357be491;hb=f00452cfdc5ab97208078f06e802b39a4839b7b3;hp=370b190a09d1d7ac7d03fe1cd45457ec866749a4;hpb=3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026;p=~andy%2Flinux

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 370b190a09d..89f98e9a024 100644
--- a/fs/nfs/dir.c
+++ b/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: