From a6c51aed48c09464d43234f4b848783cf66dde9b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 19 Jun 2011 11:54:42 -0400
Subject: [PATCH] --- yaml --- r: 257308 b: refs/heads/master c:
 78f32a9b479e9b9f1ce2bf620a7602c1cdbc4c8e h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 507b8502e7ed..603b773bbd6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f2861097467852f2271c2b40f9c3d1d01757048
+refs/heads/master: 78f32a9b479e9b9f1ce2bf620a7602c1cdbc4c8e
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 7c8a93042e63..cf2554635a1c 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1554,7 +1554,7 @@ static int path_init(int dfd, const char *name, unsigned int flags,
 			if (!S_ISDIR(dentry->d_inode->i_mode))
 				goto fput_fail;
 
-			retval = file_permission(file, MAY_EXEC);
+			retval = exec_permission(dentry->d_inode, 0);
 			if (retval)
 				goto fput_fail;
 		}