From 3e5be41f3d4354a937081a40aa719dd83dd4a535 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 17 Jul 2008 09:45:01 -0400 Subject: [PATCH] --- yaml --- r: 106365 b: refs/heads/master c: 672b16b2f66c149888bd876a4f92342112205fe1 h: refs/heads/master i: 106363: e0fa290c048c4708c4e9530a8763a1d55d1f919a v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7f1c20c4cdb..c1cc697e9f70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b77b0646ef4efe31a7449bb3d9360fd00f95433d +refs/heads/master: 672b16b2f66c149888bd876a4f92342112205fe1 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 6b0e8e5e079e..6d75430358ac 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -460,8 +460,7 @@ static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, * short-cut DAC fails, then call permission() to do more * complete permission check. */ -static int exec_permission_lite(struct inode *inode, - struct nameidata *nd) +static int exec_permission_lite(struct inode *inode) { umode_t mode = inode->i_mode; @@ -884,7 +883,7 @@ static int __link_path_walk(const char *name, struct nameidata *nd) unsigned int c; nd->flags |= LOOKUP_CONTINUE; - err = exec_permission_lite(inode, nd); + err = exec_permission_lite(inode); if (err == -EAGAIN) err = vfs_permission(nd, MAY_EXEC); if (err)