aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext4/inode.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 82f934282a1f..cbbf58327a29 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1354,7 +1354,6 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
1354 loff_t size = i_size_read(inode); 1354 loff_t size = i_size_read(inode);
1355 unsigned int len, block_start; 1355 unsigned int len, block_start;
1356 struct buffer_head *bh, *page_bufs = NULL; 1356 struct buffer_head *bh, *page_bufs = NULL;
1357 int journal_data = ext4_should_journal_data(inode);
1358 sector_t pblock = 0, cur_logical = 0; 1357 sector_t pblock = 0, cur_logical = 0;
1359 struct ext4_io_submit io_submit; 1358 struct ext4_io_submit io_submit;
1360 1359
@@ -1453,16 +1452,8 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
1453 block_commit_write(page, 0, len); 1452 block_commit_write(page, 0, len);
1454 1453
1455 clear_page_dirty_for_io(page); 1454 clear_page_dirty_for_io(page);
1456 /* 1455 err = ext4_bio_write_page(&io_submit, page, len,
1457 * Delalloc doesn't support data journalling, 1456 mpd->wbc);
1458 * but eventually maybe we'll lift this
1459 * restriction.
1460 */
1461 if (unlikely(journal_data && PageChecked(page)))
1462 err = __ext4_journalled_writepage(page, len);
1463 else
1464 err = ext4_bio_write_page(&io_submit, page,
1465 len, mpd->wbc);
1466 if (!err) 1457 if (!err)
1467 mpd->pages_written++; 1458 mpd->pages_written++;
1468 /* 1459 /*