Merge branch 'next' into upstream-merge

[pandora-kernel.git] / fs / ext4 / ialloc.c

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 509f429..1ce240a 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1239,7 +1239,6 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
        handle_t *handle;
        ext4_fsblk_t blk;
        int num, ret = 0, used_blks = 0;
-       unsigned long flags = BLKDEV_IFL_WAIT;
 
        /* This should not happen, but just to be sure check this */
        if (sb->s_flags & MS_RDONLY) {
@@ -1304,11 +1303,11 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
 
        ext4_debug("going to zero out inode table in group %d\n",
                   group);
-       if (barrier)
-               flags |= BLKDEV_IFL_BARRIER;
-       ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS, flags);
+       ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS);
        if (ret < 0)
                goto err_out;
+       if (barrier)
+               blkdev_issue_flush(sb->s_bdev, GFP_NOFS, NULL);
 
 skip_zeroout:
        ext4_lock_group(sb, group);