---

yaml --- r: 145114 b: refs/heads/master c: 7ee2cb7 h: refs/heads/master v: v3
git-mirror · May 19, 2009 · 39a82ae · 39a82ae
1 parent 973f633
commit 39a82ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: