ext4: remove __ext4_journalled_writepage() from mpage_da_submit_io() (fe089c77) · Commits · 戴 / test

We don't support delayed allocation in data=journal mode. So checking for it in mpage_da_submit_io() doesn't make really sence. If we ever decide to extend delayed allocation support to data=journal mode, adding __ext4_journalled_writepage() call will be the least of problems we have to solve. Most likely we'd have to implement separate writepages call anyways because we don't have transaction credits for writing more than a single page so mapping of page buffers would have to be done differently. Signed-off-by:

Jan Kara <jack@suse.cz> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/ext4/inode.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -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++;
		/*

Admin message