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; }