From: Joanne Koong <joannelkoong@gmail.com>
To: miklos@szeredi.hu, linux-fsdevel@vger.kernel.org
Cc: josef@toxicpanda.com, bernd.schubert@fastmail.fm,
jefflexu@linux.alibaba.com, kernel-team@meta.com
Subject: [PATCH v3 7/9] fuse: move folio_start_writeback to after the allocations in fuse_writepage_locked()
Date: Fri, 23 Aug 2024 09:27:28 -0700 [thread overview]
Message-ID: <20240823162730.521499-8-joannelkoong@gmail.com> (raw)
In-Reply-To: <20240823162730.521499-1-joannelkoong@gmail.com>
Start writeback on the folio after allocating the fuse_writepage_args
and temporary folio, instead of before the allocations.
This change is to pave the way for a following patch which will refactor
out the shared logic in fuse_writepages_fill() and fuse_writepage_locked().
No functional changes added.
Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
---
fs/fuse/file.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 905b202a7acd..3d84cbb1a2d9 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2060,12 +2060,9 @@ static int fuse_writepage_locked(struct folio *folio)
struct folio *tmp_folio;
int error = -ENOMEM;
- folio_start_writeback(folio);
-
wpa = fuse_writepage_args_alloc();
if (!wpa)
goto err;
- ap = &wpa->ia.ap;
tmp_folio = folio_alloc(GFP_NOFS | __GFP_HIGHMEM, 0);
if (!tmp_folio)
@@ -2079,16 +2076,20 @@ static int fuse_writepage_locked(struct folio *folio)
fuse_writepage_add_to_bucket(fc, wpa);
fuse_write_args_fill(&wpa->ia, wpa->ia.ff, folio_pos(folio), 0);
- folio_copy(tmp_folio, folio);
wpa->ia.write.in.write_flags |= FUSE_WRITE_CACHE;
wpa->next = NULL;
+ wpa->inode = inode;
+
+ ap = &wpa->ia.ap;
ap->args.in_pages = true;
ap->num_pages = 1;
+ ap->args.end = fuse_writepage_end;
+
+ folio_start_writeback(folio);
+ folio_copy(tmp_folio, folio);
ap->pages[0] = &tmp_folio->page;
ap->descs[0].offset = 0;
ap->descs[0].length = PAGE_SIZE;
- ap->args.end = fuse_writepage_end;
- wpa->inode = inode;
inc_wb_stat(&inode_to_bdi(inode)->wb, WB_WRITEBACK);
node_stat_add_folio(tmp_folio, NR_WRITEBACK_TEMP);
@@ -2109,7 +2110,6 @@ static int fuse_writepage_locked(struct folio *folio)
kfree(wpa);
err:
mapping_set_error(folio->mapping, error);
- folio_end_writeback(folio);
return error;
}
--
2.43.5
next prev parent reply other threads:[~2024-08-23 16:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-23 16:27 [PATCH v3 0/9] fuse: writeback clean up / refactoring Joanne Koong
2024-08-23 16:27 ` [PATCH v3 1/9] fuse: drop unused fuse_mount arg in fuse_writepage_finish() Joanne Koong
2024-08-23 16:27 ` [PATCH v3 2/9] fuse: refactor finished writeback stats updates into helper function Joanne Koong
2024-08-23 16:27 ` [PATCH v3 3/9] fuse: update stats for pages in dropped aux writeback list Joanne Koong
2024-08-23 16:27 ` [PATCH v3 4/9] fuse: clean up error handling in fuse_writepages() Joanne Koong
2024-08-23 16:27 ` [PATCH v3 5/9] fuse: move initialization of fuse_file to fuse_writepages() instead of in callback Joanne Koong
2024-08-23 18:59 ` Josef Bacik
2024-08-23 21:21 ` Joanne Koong
2024-08-23 16:27 ` [PATCH v3 6/9] fuse: convert fuse_writepages_fill() to use a folio for its tmp page Joanne Koong
2024-08-23 19:03 ` Josef Bacik
2024-08-23 21:38 ` Joanne Koong
2024-08-26 14:31 ` Josef Bacik
2024-08-23 16:27 ` Joanne Koong [this message]
2024-08-23 16:27 ` [PATCH v3 8/9] fuse: move fuse file initialization to wpa allocation time Joanne Koong
2024-08-23 16:27 ` [PATCH v3 9/9] fuse: refactor out shared logic in fuse_writepages_fill() and fuse_writepage_locked() Joanne Koong
2024-08-23 19:24 ` Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240823162730.521499-8-joannelkoong@gmail.com \
--to=joannelkoong@gmail.com \
--cc=bernd.schubert@fastmail.fm \
--cc=jefflexu@linux.alibaba.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@meta.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).