tidy do_dentry_open() up a bit

[firefly-linux-kernel-4.4.55.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index dcefb2f02d10417a87c25c6f5129ed208d34efbb..37f65fa44dbfa7c2ce066934449348602a6e27b1 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -656,30 +656,28 @@ static int do_dentry_open(struct file *f,
        f->f_mode = OPEN_FMODE(f->f_flags) | FMODE_LSEEK |
                                FMODE_PREAD | FMODE_PWRITE;
 
-       if (unlikely(f->f_flags & O_PATH))
-               f->f_mode = FMODE_PATH;
-
        path_get(&f->f_path);
        inode = f->f_inode = f->f_path.dentry->d_inode;
+       f->f_mapping = inode->i_mapping;
+
+       if (unlikely(f->f_flags & O_PATH)) {
+               f->f_mode = FMODE_PATH;
+               f->f_op = &empty_fops;
+               return 0;
+       }
+
        if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) {
                error = get_write_access(inode);
-               if (error)
+               if (unlikely(error))
                        goto cleanup_file;
                error = __mnt_want_write(f->f_path.mnt);
-               if (error) {
+               if (unlikely(error)) {
                        put_write_access(inode);
                        goto cleanup_file;
                }
                f->f_mode |= FMODE_WRITER;
        }
 
-       f->f_mapping = inode->i_mapping;
-
-       if (unlikely(f->f_mode & FMODE_PATH)) {
-               f->f_op = &empty_fops;
-               return 0;
-       }
-
        /* POSIX.1-2008/SUSv4 Section XSI 2.9.7 */
        if (S_ISREG(inode->i_mode))
                f->f_mode |= FMODE_ATOMIC_POS;