diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-17 09:45:01 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:23 -0400 |
commit | 672b16b2f66c149888bd876a4f92342112205fe1 (patch) | |
tree | bef14b7ef42dc4421a2af5402ba9d5d71addc5ad /fs | |
parent | b77b0646ef4efe31a7449bb3d9360fd00f95433d (diff) |
[PATCH] more nameidata removal: exec_permission_lite() doesn't need it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 6b0e8e5e079e..6d75430358ac 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -460,8 +460,7 @@ static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, | |||
460 | * short-cut DAC fails, then call permission() to do more | 460 | * short-cut DAC fails, then call permission() to do more |
461 | * complete permission check. | 461 | * complete permission check. |
462 | */ | 462 | */ |
463 | static int exec_permission_lite(struct inode *inode, | 463 | static int exec_permission_lite(struct inode *inode) |
464 | struct nameidata *nd) | ||
465 | { | 464 | { |
466 | umode_t mode = inode->i_mode; | 465 | umode_t mode = inode->i_mode; |
467 | 466 | ||
@@ -884,7 +883,7 @@ static int __link_path_walk(const char *name, struct nameidata *nd) | |||
884 | unsigned int c; | 883 | unsigned int c; |
885 | 884 | ||
886 | nd->flags |= LOOKUP_CONTINUE; | 885 | nd->flags |= LOOKUP_CONTINUE; |
887 | err = exec_permission_lite(inode, nd); | 886 | err = exec_permission_lite(inode); |
888 | if (err == -EAGAIN) | 887 | if (err == -EAGAIN) |
889 | err = vfs_permission(nd, MAY_EXEC); | 888 | err = vfs_permission(nd, MAY_EXEC); |
890 | if (err) | 889 | if (err) |