Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:
 "Major changes for 3.14 include support for the newly added ZERO_RANGE
  and COLLAPSE_RANGE fallocate operations, and scalability improvements
  in the jbd2 layer and in xattr handling when the extended attributes
  spill over into an external block.

  Other than that, the usual clean ups and minor bug fixes"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (42 commits)
  ext4: fix premature freeing of partial clusters split across leaf blocks
  ext4: remove unneeded test of ret variable
  ext4: fix comment typo
  ext4: make ext4_block_zero_page_range static
  ext4: atomically set inode->i_flags in ext4_set_inode_flags()
  ext4: optimize Hurd tests when reading/writing inodes
  ext4: kill i_version support for Hurd-castrated file systems
  ext4: each filesystem creates and uses its own mb_cache
  fs/mbcache.c: doucple the locking of local from global data
  fs/mbcache.c: change block and index hash chain to hlist_bl_node
  ext4: Introduce FALLOC_FL_ZERO_RANGE flag for fallocate
  ext4: refactor ext4_fallocate code
  ext4: Update inode i_size after the preallocation
  ext4: fix partial cluster handling for bigalloc file systems
  ext4: delete path dealloc code in ext4_ext_handle_uninitialized_extents
  ext4: only call sync_filesystm() when remounting read-only
  fs: push sync_filesystem() down to the file system's remount_fs()
  jbd2: improve error messages for inconsistent journal heads
  jbd2: minimize region locked by j_list_lock in jbd2_journal_forget()
  jbd2: minimize region locked by j_list_lock in journal_get_create_access()
  ...

1 files changed, 6 insertions, 18 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index a2a837f00407..0f2252ec274d 100644
--- 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);
@@ -193,20 +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;
 }