Merge tag 'mfd-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

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

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 6bea80614d77c19c6ca7b1ac9160d64f1115b36e..0f2252ec274d6c3bd0fc47a45a902ad043cd3ddf 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -104,21 +104,15 @@ static long swap_inode_boot_loader(struct super_block *sb,
        struct ext4_inode_info *ei_bl;
        struct ext4_sb_info *sbi = EXT4_SB(sb);
 
-       if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode)) {
-               err = -EINVAL;
-               goto swap_boot_out;
-       }
+       if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode))
+               return -EINVAL;
 
-       if (!inode_owner_or_capable(inode) || !capable(CAP_SYS_ADMIN)) {
-               err = -EPERM;
-               goto swap_boot_out;
-       }
+       if (!inode_owner_or_capable(inode) || !capable(CAP_SYS_ADMIN))
+               return -EPERM;
 
        inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO);
-       if (IS_ERR(inode_bl)) {
-               err = PTR_ERR(inode_bl);
-               goto swap_boot_out;
-       }
+       if (IS_ERR(inode_bl))
+               return PTR_ERR(inode_bl);
        ei_bl = EXT4_I(inode_bl);
 
        filemap_flush(inode->i_mapping);
@@ -140,7 +134,7 @@ static long swap_inode_boot_loader(struct super_block *sb,
        handle = ext4_journal_start(inode_bl, EXT4_HT_MOVE_EXTENTS, 2);
        if (IS_ERR(handle)) {
                err = -EINVAL;
-               goto swap_boot_out;
+               goto journal_err_out;
        }
 
        /* Protect extent tree against block allocations via delalloc */
@@ -193,19 +187,14 @@ static long swap_inode_boot_loader(struct super_block *sb,
                        ext4_mark_inode_dirty(handle, inode);
                }
        }
-
        ext4_journal_stop(handle);
-
        ext4_double_up_write_data_sem(inode, inode_bl);
 
+journal_err_out:
        ext4_inode_resume_unlocked_dio(inode);
        ext4_inode_resume_unlocked_dio(inode_bl);
-
        unlock_two_nondirectories(inode, inode_bl);
-
        iput(inode_bl);
-
-swap_boot_out:
        return err;
 }