Commit 27bff343 authored by Al Viro's avatar Al Viro

unroll do_last: loop in do_filp_open()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3343eb82
...@@ -1845,8 +1845,6 @@ struct file *do_filp_open(int dfd, const char *pathname, ...@@ -1845,8 +1845,6 @@ struct file *do_filp_open(int dfd, const char *pathname,
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 @@ struct file *do_filp_open(int dfd, const char *pathname, ...@@ -1926,7 +1924,13 @@ struct file *do_filp_open(int dfd, const char *pathname,
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;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment