From 0c3375828a2d7fb81e276b58dcc9da83cf07ef5a Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 24 Dec 2009 06:51:13 -0500 Subject: [PATCH] --- yaml --- r: 185924 b: refs/heads/master c: 5b369df8263fe7ab4dac2bb08b8f423dc5e33752 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5eedb733e220..6d0489a262c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a66179e13504c676f891908a1e94912ec5cdefb +refs/heads/master: 5b369df8263fe7ab4dac2bb08b8f423dc5e33752 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 5b9016006913..5ea7330c184b 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1646,7 +1646,7 @@ static struct file *finish_open(struct nameidata *nd, } 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 @@ struct file *do_filp_open(int dfd, const char *pathname, 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 @@ struct file *do_filp_open(int dfd, const char *pathname, 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);