Skip to content

Commit

Permalink
Don't pass mangled open_flag to finish_open()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 5, 2010
1 parent a2c36b4 commit 9a66179
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -1854,7 +1854,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
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;
Expand Down

0 comments on commit 9a66179

Please sign in to comment.