Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7637241e authored by Jens Axboe's avatar Jens Axboe
Browse files

writeback: add wbc_to_write_flags() 



Add wbc_to_write_flags(), which returns the write modifier flags to use,
based on a struct writeback_control. No functional changes in this
patch, but it prepares us for factoring other wbc fields for write type.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1d796d6a

fs/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1697,7 +1697,7 @@ int __block_write_full_page(struct inode *inode, struct page *page, 
	struct buffer_head *bh, *head;

	unsigned int blocksize, bbits;

	int nr_underway = 0;

	int write_flags = (wbc->sync_mode == WB_SYNC_ALL ? REQ_SYNC : 0);

	int write_flags = wbc_to_write_flags(wbc);



	head = create_page_buffers(page, inode,

					(1 << BH_Dirty)|(1 << BH_Uptodate));

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ static int f2fs_write_data_page(struct page *page, 
		.sbi = sbi,

		.type = DATA,

		.op = REQ_OP_WRITE,

		.op_flags = (wbc->sync_mode == WB_SYNC_ALL) ? REQ_SYNC : 0,

		.op_flags = wbc_to_write_flags(wbc),

		.page = page,

		.encrypted_page = NULL,

	};

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -1570,7 +1570,7 @@ static int f2fs_write_node_page(struct page *page, 
		.sbi = sbi,

		.type = NODE,

		.op = REQ_OP_WRITE,

		.op_flags = (wbc->sync_mode == WB_SYNC_ALL) ? REQ_SYNC : 0,

		.op_flags = wbc_to_write_flags(wbc),

		.page = page,

		.encrypted_page = NULL,

	};

fs/gfs2/meta_io.c

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb 
{

	struct buffer_head *bh, *head;

	int nr_underway = 0;

	int write_flags = REQ_META | REQ_PRIO |

		(wbc->sync_mode == WB_SYNC_ALL ? REQ_SYNC : 0);

	int write_flags = REQ_META | REQ_PRIO | wbc_to_write_flags(wbc);



	BUG_ON(!PageLocked(page));

	BUG_ON(!page_has_buffers(page));

fs/mpage.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, 
	struct buffer_head map_bh;

	loff_t i_size = i_size_read(inode);

	int ret = 0;

	int op_flags = (wbc->sync_mode == WB_SYNC_ALL ? REQ_SYNC : 0);

	int op_flags = wbc_to_write_flags(wbc);



	if (page_has_buffers(page)) {

		struct buffer_head *head = page_buffers(page);