Commit ecee6165 authored by Mark Tinguely's avatar Mark Tinguely Committed by Andrew Morton
Browse files

ocfs2: convert ocfs2_write_failure() to use a folio 

Remove the folio->page conversion and just use the folio.

Link: https://lkml.kernel.org/r/20241205171653.3179945-11-willy@infradead.org


Signed-off-by: default avatarMark Tinguely <mark.tinguely@oracle.com>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7e119cff

fs/ocfs2/aops.c

+3 −4
Original line number Diff line number Diff line
@@ -930,20 +930,19 @@ static void ocfs2_write_failure(struct inode *inode, 
	int i;

	unsigned from = user_pos & (PAGE_SIZE - 1),

		to = user_pos + user_len;

	struct page *tmppage;



	if (wc->w_target_folio)

		ocfs2_zero_new_buffers(wc->w_target_folio, from, to);



	for (i = 0; i < wc->w_num_folios; i++) {

		tmppage = &wc->w_folios[i]->page;

		struct folio *folio = wc->w_folios[i];



		if (tmppage && page_has_buffers(tmppage)) {

		if (folio && folio_buffers(folio)) {

			if (ocfs2_should_order_data(inode))

				ocfs2_jbd2_inode_add_write(wc->w_handle, inode,

							   user_pos, user_len);



			block_commit_write(tmppage, from, to);

			block_commit_write(&folio->page, from, to);

		}

	}

}