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

[linux-2.6-microblaze.git] / fs / ext4 / ioctl.c

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 6eed617..606dee9 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -148,7 +148,7 @@ static long swap_inode_boot_loader(struct super_block *sb,
                goto journal_err_out;
        }
 
-       down_write(&EXT4_I(inode)->i_mmap_sem);
+       filemap_invalidate_lock(inode->i_mapping);
        err = filemap_write_and_wait(inode->i_mapping);
        if (err)
                goto err_out;
@@ -256,7 +256,7 @@ err_out1:
        ext4_double_up_write_data_sem(inode, inode_bl);
 
 err_out:
-       up_write(&EXT4_I(inode)->i_mmap_sem);
+       filemap_invalidate_unlock(inode->i_mapping);
 journal_err_out:
        unlock_two_nondirectories(inode, inode_bl);
        iput(inode_bl);
@@ -1154,7 +1154,9 @@ resizefs_out:
                                err = PTR_ERR(handle);
                                goto pwsalt_err_exit;
                        }
-                       err = ext4_journal_get_write_access(handle, sbi->s_sbh);
+                       err = ext4_journal_get_write_access(handle, sb,
+                                                           sbi->s_sbh,
+                                                           EXT4_JTR_NONE);
                        if (err)
                                goto pwsalt_err_journal;
                        lock_buffer(sbi->s_sbh);