summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-12-24 06:49:47 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2010-03-05 09:01:25 -0500
commit9a66179e13504c676f891908a1e94912ec5cdefb (patch)
treeddfa9f767ba393744adc6714a4c7ef0966222d81
parenta2c36b450ee68470836cb858c58a6ba3a52c5ec5 (diff)
Don't pass mangled open_flag to finish_open()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 52517e0bbdde..5b9016006913 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1591,13 +1591,13 @@ static int open_will_truncate(int flag, struct inode *inode)
}
static struct file *finish_open(struct nameidata *nd,
- int open_flag, int flag, int acc_mode)
+ int open_flag, int acc_mode)
{
struct file *filp;
int will_truncate;
int error;
- will_truncate = open_will_truncate(flag, nd->path.dentry->d_inode);
+ will_truncate = open_will_truncate(open_flag, nd->path.dentry->d_inode);
if (will_truncate) {
error = mnt_want_write(nd->path.mnt);
if (error)
@@ -1733,7 +1733,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
error = -EISDIR;
if (S_ISDIR(path->dentry->d_inode->i_mode))
goto exit;
- filp = finish_open(nd, open_flag, flag, acc_mode);
+ filp = finish_open(nd, open_flag, acc_mode);
return filp;
exit_mutex_unlock:
@@ -1854,7 +1854,7 @@ reval:
return filp;
ok:
- filp = finish_open(&nd, open_flag, flag, acc_mode);
+ filp = finish_open(&nd, open_flag, acc_mode);
if (nd.root.mnt)
path_put(&nd.root);
return filp;