diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-24 06:51:13 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-05 09:01:27 -0500 |
| commit | 5b369df8263fe7ab4dac2bb08b8f423dc5e33752 (patch) | |
| tree | 0b127915244593c1ed2494454d191a4fedb4d661 | |
| parent | 9a66179e13504c676f891908a1e94912ec5cdefb (diff) | |
| download | linux-5b369df8263fe7ab4dac2bb08b8f423dc5e33752.tar.bz2 | |
Get rid of passing mangled flag to do_last()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5b9016006913..5ea7330c184b 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1646,7 +1646,7 @@ exit: } static struct file *do_last(struct nameidata *nd, struct path *path, - int open_flag, int flag, int acc_mode, + int open_flag, int acc_mode, int mode, const char *pathname, int *is_link) { @@ -1712,12 +1712,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path, audit_inode(pathname, path->dentry); error = -EEXIST; - if (flag & O_EXCL) + if (open_flag & O_EXCL) goto exit_dput; if (__follow_mount(path)) { error = -ELOOP; - if (flag & O_NOFOLLOW) + if (open_flag & O_NOFOLLOW) goto exit_dput; } @@ -1845,7 +1845,7 @@ reval: nd.flags |= LOOKUP_CREATE | LOOKUP_OPEN; if (flag & O_EXCL) nd.flags |= LOOKUP_EXCL; - filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode, + filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname, &is_link); if (is_link) goto do_link; @@ -1907,7 +1907,7 @@ do_link: nd.flags &= ~LOOKUP_PARENT; if (nd.last_type == LAST_BIND) goto ok; - filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode, + filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname, &is_link); if (nd.last_type == LAST_NORM) __putname(nd.last.name); |