Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get rid of passing mangled flag to do_last()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-12-24 06:51:13 -05:00
parent 9a66179e13
commit 5b369df826
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/namei.c
View file

@ -1646,7 +1646,7 @@ exit:
} }
static struct file *do_last(struct nameidata *nd, struct path *path, 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 mode, const char *pathname,
int *is_link) int *is_link)
{ {
@ -1712,12 +1712,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
audit_inode(pathname, path->dentry); audit_inode(pathname, path->dentry);
error = -EEXIST; error = -EEXIST;
if (flag & O_EXCL) if (open_flag & O_EXCL)
goto exit_dput; goto exit_dput;
if (__follow_mount(path)) { if (__follow_mount(path)) {
error = -ELOOP; error = -ELOOP;
if (flag & O_NOFOLLOW) if (open_flag & O_NOFOLLOW)
goto exit_dput; goto exit_dput;
} }
@ -1845,7 +1845,7 @@ reval:
nd.flags |= LOOKUP_CREATE | LOOKUP_OPEN; nd.flags |= LOOKUP_CREATE | LOOKUP_OPEN;
if (flag & O_EXCL) if (flag & O_EXCL)
nd.flags |= LOOKUP_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); pathname, &is_link);
if (is_link) if (is_link)
goto do_link; goto do_link;
@ -1907,7 +1907,7 @@ do_link:
nd.flags &= ~LOOKUP_PARENT; nd.flags &= ~LOOKUP_PARENT;
if (nd.last_type == LAST_BIND) if (nd.last_type == LAST_BIND)
goto ok; 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); pathname, &is_link);
if (nd.last_type == LAST_NORM) if (nd.last_type == LAST_NORM)
__putname(nd.last.name); __putname(nd.last.name);