Andrew Morton
2023-Mar-28 23:21 UTC
[Ocfs2-devel] [merged mm-stable] ocfs2-dont-use-write_one_page-in-ocfs2_duplicate_clusters_by_page.patch removed from -mm tree
The quilt patch titled
Subject: ocfs2: don't use write_one_page in
ocfs2_duplicate_clusters_by_page
has been removed from the -mm tree. Its filename was
ocfs2-dont-use-write_one_page-in-ocfs2_duplicate_clusters_by_page.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Hellwig <hch at lst.de>
Subject: ocfs2: don't use write_one_page in ocfs2_duplicate_clusters_by_page
Date: Tue, 7 Mar 2023 15:31:24 +0100
Use filemap_write_and_wait_range to write back the range of the dirty page
instead of write_one_page in preparation of removing write_one_page and
eventually ->writepage.
Link: https://lkml.kernel.org/r/20230307143125.27778-3-hch at lst.de
Signed-off-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Jan Kara <jack at suse.cz>
Reviewed-by: Joseph Qi <joseph.qi at linux.alibaba.com>
Cc: Changwei Ge <gechangwei at live.cn>
Cc: Dave Kleikamp <dave.kleikamp at oracle.com>
Cc: Evgeniy Dushistov <dushistov at mail.ru>
Cc: Gang He <ghe at suse.com>
Cc: Jan Kara via Ocfs2-devel <ocfs2-devel at oss.oracle.com>
Cc: Joel Becker <jlbec at evilplan.org>
Cc: Joseph Qi <jiangqi903 at gmail.com>
Cc: Jun Piao <piaojun at huawei.com>
Cc: Junxiao Bi <junxiao.bi at oracle.com>
Cc: Mark Fasheh <mark at fasheh.com>
Cc: Matthew Wilcox (Oracle) <willy at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---
fs/ocfs2/refcounttree.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
a/fs/ocfs2/refcounttree.c~ocfs2-dont-use-write_one_page-in-ocfs2_duplicate_clusters_by_page
+++ a/fs/ocfs2/refcounttree.c
@@ -2952,10 +2952,11 @@ retry:
*/
if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) {
if (PageDirty(page)) {
- /*
- * write_on_page will unlock the page on return
- */
- ret = write_one_page(page);
+ unlock_page(page);
+ put_page(page);
+
+ ret = filemap_write_and_wait_range(mapping,
+ offset, map_end - 1);
goto retry;
}
}
_
Patches currently in -mm which might be from hch at lst.de are
mm-dont-look-at-xarray-value-entries-in-split_huge_pages_in_file.patch
mm-make-mapping_get_entry-available-outside-of-filemapc.patch
mm-use-filemap_get_entry-in-filemap_get_incore_folio.patch
shmem-open-code-the-page-cache-lookup-in-shmem_get_folio_gfp.patch
mm-remove-fgp_entry.patch
mm-return-an-err_ptr-from-__filemap_get_folio.patch
mm-return-an-err_ptr-from-__filemap_get_folio-fix.patch