From b53b21bc5eb6b62ecdd2649d04fd6dd1984a119a Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 28 Jan 2013 09:38:49 -0500 Subject: [PATCH] --- yaml --- r: 359039 b: refs/heads/master c: fe089c77f1466c74f0f19ad2475b1630216b8b19 h: refs/heads/master i: 359037: 0259643903b40fbbf01438bfde6d7e33b005782e 359035: 70c07f2efe802d9ae438296011c5f4348fd445b7 359031: caebd7da5e11c2a71ee2fbfdd111879f9f960016 359023: 095574547865cf04e83196e2a4455c6eafb60b21 359007: 7c6044d929617bb0698e3f7c556c39c3cab1fb22 358975: 4a166215cea8a9752190a4b9ef853a41592a0bd6 358911: 20722411abb810f281a58d2e4411f8617def253f v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index b557891b73a0..c3ff3677eb7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ae48a6354a364413d372df1525d523a3fb4fb8c +refs/heads/master: fe089c77f1466c74f0f19ad2475b1630216b8b19 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 82f934282a1f..cbbf58327a29 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -1354,7 +1354,6 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd, loff_t size = i_size_read(inode); unsigned int len, block_start; struct buffer_head *bh, *page_bufs = NULL; - int journal_data = ext4_should_journal_data(inode); sector_t pblock = 0, cur_logical = 0; struct ext4_io_submit io_submit; @@ -1453,16 +1452,8 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd, block_commit_write(page, 0, len); clear_page_dirty_for_io(page); - /* - * Delalloc doesn't support data journalling, - * but eventually maybe we'll lift this - * restriction. - */ - if (unlikely(journal_data && PageChecked(page))) - err = __ext4_journalled_writepage(page, len); - else - err = ext4_bio_write_page(&io_submit, page, - len, mpd->wbc); + err = ext4_bio_write_page(&io_submit, page, len, + mpd->wbc); if (!err) mpd->pages_written++; /*