do_last(): merge the may_open() calls

have FMODE_OPENED case rejoin the main path at earlier point

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namei.c b/fs/namei.c
index 7e932d9a71a9979dca800c7c36562787eac2d067..2f8a5d3be784a69abe08cdfaf359cd24a8b92aa5 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3207,10 +3207,7 @@ static const char *do_last(struct nameidata *nd,
                audit_inode(nd->name, file->f_path.dentry, 0);
                dput(nd->path.dentry);
                nd->path.dentry = dentry;
-               error = may_open(&nd->path, acc_mode, open_flag);
-               if (error)
-                       goto out;
-               goto opened;
+               goto finish_open_created;
        }
 
        if (file->f_mode & FMODE_CREATED) {
@@ -3277,11 +3274,10 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
-       BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */
-       error = vfs_open(&nd->path, file);
+       if (!(file->f_mode & FMODE_OPENED))
+               error = vfs_open(&nd->path, file);
        if (error)
                goto out;
-opened:
        error = ima_file_check(file, op->acc_mode);
        if (!error && will_truncate)
                error = handle_truncate(file);