unroll do_last: loop in do_filp_open()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
3343eb8209
commit
27bff34300
1 changed files with 7 additions and 3 deletions
10
fs/namei.c
10
fs/namei.c
|
@ -1845,8 +1845,6 @@ reval:
|
||||||
mutex_lock(&dir->d_inode->i_mutex);
|
mutex_lock(&dir->d_inode->i_mutex);
|
||||||
path.dentry = lookup_hash(&nd);
|
path.dentry = lookup_hash(&nd);
|
||||||
path.mnt = nd.path.mnt;
|
path.mnt = nd.path.mnt;
|
||||||
|
|
||||||
do_last:
|
|
||||||
filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
|
filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
|
||||||
pathname, dir, &is_link);
|
pathname, dir, &is_link);
|
||||||
if (is_link)
|
if (is_link)
|
||||||
|
@ -1926,7 +1924,13 @@ do_link:
|
||||||
path.dentry = lookup_hash(&nd);
|
path.dentry = lookup_hash(&nd);
|
||||||
path.mnt = nd.path.mnt;
|
path.mnt = nd.path.mnt;
|
||||||
__putname(nd.last.name);
|
__putname(nd.last.name);
|
||||||
goto do_last;
|
filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
|
||||||
|
pathname, dir, &is_link);
|
||||||
|
if (is_link)
|
||||||
|
goto do_link;
|
||||||
|
if (nd.root.mnt)
|
||||||
|
path_put(&nd.root);
|
||||||
|
return filp;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue