From: Andreas Gruenbacher <agruenba@redhat.com> To: Christoph Hellwig <hch@infradead.org>, "Darrick J . Wong" <djwong@kernel.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Matthew Wilcox <willy@infradead.org> Cc: Andreas Gruenbacher <agruenba@redhat.com>, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, cluster-devel@redhat.com Subject: [RFC v3 2/7] iomap: Add iomap_folio_done helper Date: Fri, 16 Dec 2022 16:06:21 +0100 [thread overview] Message-ID: <20221216150626.670312-3-agruenba@redhat.com> (raw) In-Reply-To: <20221216150626.670312-1-agruenba@redhat.com> Add an iomap_folio_done() helper to encapsulate unlocking the folio, calling ->page_done(), and putting the folio. This doesn't change the functionality. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> --- fs/iomap/buffered-io.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 347010c6a652..8ce9abb29d46 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -575,6 +575,19 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos, return 0; } +static void iomap_folio_done(struct iomap_iter *iter, loff_t pos, size_t ret, + struct folio *folio) +{ + const struct iomap_page_ops *page_ops = iter->iomap.page_ops; + + if (folio) + folio_unlock(folio); + if (page_ops && page_ops->page_done) + page_ops->page_done(iter->inode, pos, ret, &folio->page); + if (folio) + folio_put(folio); +} + static int iomap_write_begin_inline(const struct iomap_iter *iter, struct folio *folio) { @@ -616,7 +629,8 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, fgp, mapping_gfp_mask(iter->inode->i_mapping)); if (!folio) { status = (iter->flags & IOMAP_NOWAIT) ? -EAGAIN : -ENOMEM; - goto out_no_page; + iomap_folio_done(iter, pos, 0, NULL); + return status; } /* @@ -656,13 +670,9 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, return 0; out_unlock: - folio_unlock(folio); - folio_put(folio); + iomap_folio_done(iter, pos, 0, folio); iomap_write_failed(iter->inode, pos, len); -out_no_page: - if (page_ops && page_ops->page_done) - page_ops->page_done(iter->inode, pos, 0, NULL); return status; } @@ -712,7 +722,6 @@ static size_t iomap_write_end_inline(const struct iomap_iter *iter, static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len, size_t copied, struct folio *folio) { - const struct iomap_page_ops *page_ops = iter->iomap.page_ops; const struct iomap *srcmap = iomap_iter_srcmap(iter); loff_t old_size = iter->inode->i_size; size_t ret; @@ -736,11 +745,8 @@ static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len, iter->iomap.flags |= IOMAP_F_SIZE_CHANGED; folio_may_straddle_isize(iter->inode, folio, old_size, pos); } - folio_unlock(folio); - if (page_ops && page_ops->page_done) - page_ops->page_done(iter->inode, pos, ret, &folio->page); - folio_put(folio); + iomap_folio_done(iter, pos, ret, folio); if (ret < len) iomap_write_failed(iter->inode, pos + ret, len - ret); -- 2.38.1
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Gruenbacher <agruenba@redhat.com> To: cluster-devel.redhat.com Subject: [Cluster-devel] [RFC v3 2/7] iomap: Add iomap_folio_done helper Date: Fri, 16 Dec 2022 16:06:21 +0100 [thread overview] Message-ID: <20221216150626.670312-3-agruenba@redhat.com> (raw) In-Reply-To: <20221216150626.670312-1-agruenba@redhat.com> Add an iomap_folio_done() helper to encapsulate unlocking the folio, calling ->page_done(), and putting the folio. This doesn't change the functionality. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> --- fs/iomap/buffered-io.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 347010c6a652..8ce9abb29d46 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -575,6 +575,19 @@ static int __iomap_write_begin(const struct iomap_iter *iter, loff_t pos, return 0; } +static void iomap_folio_done(struct iomap_iter *iter, loff_t pos, size_t ret, + struct folio *folio) +{ + const struct iomap_page_ops *page_ops = iter->iomap.page_ops; + + if (folio) + folio_unlock(folio); + if (page_ops && page_ops->page_done) + page_ops->page_done(iter->inode, pos, ret, &folio->page); + if (folio) + folio_put(folio); +} + static int iomap_write_begin_inline(const struct iomap_iter *iter, struct folio *folio) { @@ -616,7 +629,8 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, fgp, mapping_gfp_mask(iter->inode->i_mapping)); if (!folio) { status = (iter->flags & IOMAP_NOWAIT) ? -EAGAIN : -ENOMEM; - goto out_no_page; + iomap_folio_done(iter, pos, 0, NULL); + return status; } /* @@ -656,13 +670,9 @@ static int iomap_write_begin(struct iomap_iter *iter, loff_t pos, return 0; out_unlock: - folio_unlock(folio); - folio_put(folio); + iomap_folio_done(iter, pos, 0, folio); iomap_write_failed(iter->inode, pos, len); -out_no_page: - if (page_ops && page_ops->page_done) - page_ops->page_done(iter->inode, pos, 0, NULL); return status; } @@ -712,7 +722,6 @@ static size_t iomap_write_end_inline(const struct iomap_iter *iter, static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len, size_t copied, struct folio *folio) { - const struct iomap_page_ops *page_ops = iter->iomap.page_ops; const struct iomap *srcmap = iomap_iter_srcmap(iter); loff_t old_size = iter->inode->i_size; size_t ret; @@ -736,11 +745,8 @@ static size_t iomap_write_end(struct iomap_iter *iter, loff_t pos, size_t len, iter->iomap.flags |= IOMAP_F_SIZE_CHANGED; folio_may_straddle_isize(iter->inode, folio, old_size, pos); } - folio_unlock(folio); - if (page_ops && page_ops->page_done) - page_ops->page_done(iter->inode, pos, ret, &folio->page); - folio_put(folio); + iomap_folio_done(iter, pos, ret, folio); if (ret < len) iomap_write_failed(iter->inode, pos + ret, len - ret); -- 2.38.1
next prev parent reply other threads:[~2022-12-16 15:07 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-16 15:06 [RFC v3 0/7] Turn iomap_page_ops into iomap_folio_ops Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-16 15:06 ` [RFC v3 1/7] fs: Add folio_may_straddle_isize helper Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-23 14:56 ` Christoph Hellwig 2022-12-23 14:56 ` [Cluster-devel] " Christoph Hellwig 2022-12-23 22:04 ` Andreas Grünbacher 2022-12-23 22:04 ` [Cluster-devel] " Andreas Grünbacher 2022-12-24 7:21 ` Christoph Hellwig 2022-12-16 15:06 ` Andreas Gruenbacher [this message] 2022-12-16 15:06 ` [Cluster-devel] [RFC v3 2/7] iomap: Add iomap_folio_done helper Andreas Gruenbacher 2022-12-23 15:02 ` Christoph Hellwig 2022-12-23 15:02 ` [Cluster-devel] " Christoph Hellwig 2022-12-23 20:54 ` Andreas Grünbacher 2022-12-23 20:54 ` [Cluster-devel] " Andreas Grünbacher 2022-12-24 7:22 ` Christoph Hellwig 2022-12-24 7:22 ` [Cluster-devel] " Christoph Hellwig 2022-12-16 15:06 ` [RFC v3 3/7] iomap/gfs2: Unlock and put folio in page_done handler Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-23 15:03 ` Christoph Hellwig 2022-12-23 15:03 ` [Cluster-devel] " Christoph Hellwig 2022-12-16 15:06 ` [RFC v3 4/7] iomap: Add iomap_folio_prepare helper Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-23 15:04 ` Christoph Hellwig 2022-12-23 15:04 ` [Cluster-devel] " Christoph Hellwig 2022-12-23 21:05 ` Andreas Grünbacher 2022-12-23 21:05 ` [Cluster-devel] " Andreas Grünbacher 2022-12-24 7:23 ` Christoph Hellwig 2022-12-24 7:23 ` [Cluster-devel] " Christoph Hellwig 2022-12-25 9:12 ` Matthew Wilcox 2022-12-25 9:12 ` [Cluster-devel] " Matthew Wilcox 2022-12-28 15:55 ` Christoph Hellwig 2022-12-28 15:55 ` [Cluster-devel] " Christoph Hellwig 2022-12-16 15:06 ` [RFC v3 5/7] iomap: Get page in page_prepare handler Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-16 16:30 ` Matthew Wilcox 2022-12-16 16:30 ` [Cluster-devel] " Matthew Wilcox 2022-12-16 17:15 ` Andreas Gruenbacher 2022-12-16 17:15 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-23 15:07 ` Christoph Hellwig 2022-12-23 15:07 ` [Cluster-devel] " Christoph Hellwig 2022-12-16 15:06 ` [RFC v3 6/7] iomap/xfs: Eliminate the iomap_valid handler Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-23 15:10 ` Christoph Hellwig 2022-12-23 15:10 ` [Cluster-devel] " Christoph Hellwig 2022-12-16 15:06 ` [RFC v3 7/7] iomap: Rename page_ops to folio_ops Andreas Gruenbacher 2022-12-16 15:06 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 0/7] Turn iomap_page_ops into iomap_folio_ops Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 1/7] fs: Add folio_may_straddle_isize helper Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 2/7] iomap: Add iomap_folio_done helper Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 3/7] iomap/gfs2: Unlock and put folio in page_done handler Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 4/7] iomap: Add iomap_folio_prepare helper Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 5/7] iomap/gfs2: Get page in page_prepare handler Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 6/7] iomap/xfs: Eliminate the iomap_valid handler Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher 2022-12-18 22:10 ` [RFC v4 7/7] iomap: Rename page_ops to folio_ops Andreas Gruenbacher 2022-12-18 22:10 ` [Cluster-devel] " Andreas Gruenbacher
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=20221216150626.670312-3-agruenba@redhat.com \ --to=agruenba@redhat.com \ --cc=cluster-devel@redhat.com \ --cc=djwong@kernel.org \ --cc=hch@infradead.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ --cc=willy@infradead.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.