diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 04:20:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 04:20:27 +0200 |
| commit | 0e497ad5255069b2d394168568790d26bbc8d365 (patch) | |
| tree | d5e3dc517210be696e2acf7fc61b9f1e87319df2 /fs/ocfs2 | |
| parent | Merge tag 'pull-fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | mm,jfs: move write_one_page/folio_write_one to jfs (diff) | |
| download | linux-0e497ad5255069b2d394168568790d26bbc8d365.tar.xz linux-0e497ad5255069b2d394168568790d26bbc8d365.zip | |
Merge tag 'pull-write-one-page' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs write_one_page removal from Al Viro:
"write_one_page series"
* tag 'pull-write-one-page' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
mm,jfs: move write_one_page/folio_write_one to jfs
ocfs2: don't use write_one_page in ocfs2_duplicate_clusters_by_page
ufs: don't flush page immediately for DIRSYNC directories
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/refcounttree.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 5a656dc683f1..564ab48d03ef 100644 --- a/fs/ocfs2/refcounttree.c +++ b/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; } } |