unroll do_last: loop in do_filp_open()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/namei.c b/fs/namei.c
index bff27c0..fc6bed7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1845,8 +1845,6 @@
mutex_lock(&dir->d_inode->i_mutex);
path.dentry = lookup_hash(&nd);
path.mnt = nd.path.mnt;
-
-do_last:
filp = do_last(&nd, &path, open_flag, flag, acc_mode, mode,
pathname, dir, &is_link);
if (is_link)
@@ -1926,7 +1924,13 @@
path.dentry = lookup_hash(&nd);
path.mnt = nd.path.mnt;
__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;
}
/**