From: Andreas Gruenbacher <agruenba@redhat.com>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-ext4@vger.kernel.org, gfs2@lists.linux.dev,
linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org,
"Darrick J . Wong" <djwong@kernel.org>,
linux-erofs@lists.ozlabs.org, "Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>
Subject: Re: [PATCH 3/3] gfs2: Convert stuffed_readpage() to stuffed_read_folio()
Date: Thu, 9 Nov 2023 22:52:37 +0100 [thread overview]
Message-ID: <CAHc6FU6-a5Xf1Zesj0Y9udXLaxg5nnK5t9GPxA_b5PHNU8brvw@mail.gmail.com> (raw)
In-Reply-To: <20231107212643.3490372-4-willy@infradead.org>
On Tue, Nov 7, 2023 at 10:27 PM Matthew Wilcox (Oracle)
<willy@infradead.org> wrote:
> Use folio_fill_tail() to implement the unstuffing and folio_end_read()
> to simultaneously mark the folio uptodate and unlock it. Unifies a
> couple of code paths.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
> fs/gfs2/aops.c | 37 +++++++++++++++++--------------------
> 1 file changed, 17 insertions(+), 20 deletions(-)
>
> diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
> index 9611bfceda4b..ba8742dc91f8 100644
> --- a/fs/gfs2/aops.c
> +++ b/fs/gfs2/aops.c
> @@ -403,18 +403,18 @@ static int gfs2_jdata_writepages(struct address_space *mapping,
> }
>
> /**
> - * stuffed_readpage - Fill in a Linux folio with stuffed file data
> + * stuffed_read_folio - Fill in a Linux folio with stuffed file data
> * @ip: the inode
> * @folio: the folio
> *
> * Returns: errno
> */
> -static int stuffed_readpage(struct gfs2_inode *ip, struct folio *folio)
> +static int stuffed_read_folio(struct gfs2_inode *ip, struct folio *folio)
> {
> - struct buffer_head *dibh;
> - size_t i_size = i_size_read(&ip->i_inode);
> - void *data;
> - int error;
> + struct buffer_head *dibh = NULL;
> + size_t dsize = i_size_read(&ip->i_inode);
> + void *from = NULL;
> + int error = 0;
>
> /*
> * Due to the order of unstuffing files and ->fault(), we can be
> @@ -422,22 +422,20 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct folio *folio)
> * so we need to supply one here. It doesn't happen often.
> */
> if (unlikely(folio->index)) {
> - folio_zero_range(folio, 0, folio_size(folio));
> - folio_mark_uptodate(folio);
> - return 0;
> + dsize = 0;
> + } else {
> + error = gfs2_meta_inode_buffer(ip, &dibh);
> + if (error)
> + goto out;
> + from = dibh->b_data + sizeof(struct gfs2_dinode);
> }
>
> - error = gfs2_meta_inode_buffer(ip, &dibh);
> - if (error)
> - return error;
> -
> - data = dibh->b_data + sizeof(struct gfs2_dinode);
> - memcpy_to_folio(folio, 0, data, i_size);
> - folio_zero_range(folio, i_size, folio_size(folio) - i_size);
> + folio_fill_tail(folio, 0, from, dsize);
> brelse(dibh);
> - folio_mark_uptodate(folio);
> +out:
> + folio_end_read(folio, error == 0);
>
> - return 0;
> + return error;
> }
>
> /**
> @@ -456,8 +454,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)
> (i_blocksize(inode) == PAGE_SIZE && !folio_buffers(folio))) {
> error = iomap_read_folio(folio, &gfs2_iomap_ops);
> } else if (gfs2_is_stuffed(ip)) {
> - error = stuffed_readpage(ip, folio);
> - folio_unlock(folio);
> + error = stuffed_read_folio(ip, folio);
> } else {
> error = mpage_read_folio(folio, gfs2_block_map);
> }
> --
> 2.42.0
>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Thanks,
Andreas
prev parent reply other threads:[~2023-11-09 21:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 21:26 [PATCH 0/3] Add folio_zero_tail() and folio_fill_tail() Matthew Wilcox (Oracle)
2023-11-07 21:26 ` [PATCH 1/3] mm: Add folio_zero_tail() and use it in ext4 Matthew Wilcox (Oracle)
2023-11-08 23:06 ` Andrew Morton
2023-11-09 0:12 ` Andreas Grünbacher
2023-11-09 17:27 ` Andrew Morton
2023-11-09 17:37 ` Matthew Wilcox
2023-11-09 21:50 ` Andreas Gruenbacher
2023-11-07 21:26 ` [PATCH 2/3] mm: Add folio_fill_tail() and use it in iomap Matthew Wilcox (Oracle)
2023-11-09 21:50 ` Andreas Gruenbacher
2023-11-10 17:09 ` Matthew Wilcox
2023-11-10 17:50 ` Andreas Grünbacher
2023-11-11 4:02 ` Gao Xiang
2023-11-07 21:26 ` [PATCH 3/3] gfs2: Convert stuffed_readpage() to stuffed_read_folio() Matthew Wilcox (Oracle)
2023-11-09 21:52 ` Andreas Gruenbacher [this message]
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=CAHc6FU6-a5Xf1Zesj0Y9udXLaxg5nnK5t9GPxA_b5PHNU8brvw@mail.gmail.com \
--to=agruenba@redhat.com \
--cc=adilger.kernel@dilger.ca \
--cc=akpm@linux-foundation.org \
--cc=djwong@kernel.org \
--cc=gfs2@lists.linux.dev \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
--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: 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 read-only IMAP folder(s) and NNTP newsgroup(s).