aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 509f429f71e..1ce240a23eb 100644
--- 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,
1239 handle_t *handle; 1239 handle_t *handle;
1240 ext4_fsblk_t blk; 1240 ext4_fsblk_t blk;
1241 int num, ret = 0, used_blks = 0; 1241 int num, ret = 0, used_blks = 0;
1242 unsigned long flags = BLKDEV_IFL_WAIT;
1243 1242
1244 /* This should not happen, but just to be sure check this */ 1243 /* This should not happen, but just to be sure check this */
1245 if (sb->s_flags & MS_RDONLY) { 1244 if (sb->s_flags & MS_RDONLY) {
@@ -1304,11 +1303,11 @@ extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
1304 1303
1305 ext4_debug("going to zero out inode table in group %d\n", 1304 ext4_debug("going to zero out inode table in group %d\n",
1306 group); 1305 group);
1307 if (barrier) 1306 ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS);
1308 flags |= BLKDEV_IFL_BARRIER;
1309 ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS, flags);
1310 if (ret < 0) 1307 if (ret < 0)
1311 goto err_out; 1308 goto err_out;
1309 if (barrier)
1310 blkdev_issue_flush(sb->s_bdev, GFP_NOFS, NULL);
1312 1311
1313skip_zeroout: 1312skip_zeroout:
1314 ext4_lock_group(sb, group); 1313 ext4_lock_group(sb, group);