From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Christian Brauner <brauner@kernel.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 04/16] efs: Convert efs_symlink_read_folio to use a folio
Date: Thu, 30 May 2024 21:20:56 +0100 [thread overview]
Message-ID: <20240530202110.2653630-5-willy@infradead.org> (raw)
In-Reply-To: <20240530202110.2653630-1-willy@infradead.org>
Remove the conversion back into a page and use the folio APIs throughout.
Remove the setting of PG_error instead of converting it; it is unused
by core code or by the rest of EFS, so it serves no purpose here.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/efs/symlink.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c
index 3b03a573cb1a..7749feded722 100644
--- a/fs/efs/symlink.c
+++ b/fs/efs/symlink.c
@@ -14,10 +14,9 @@
static int efs_symlink_read_folio(struct file *file, struct folio *folio)
{
- struct page *page = &folio->page;
- char *link = page_address(page);
- struct buffer_head * bh;
- struct inode * inode = page->mapping->host;
+ char *link = folio_address(folio);
+ struct buffer_head *bh;
+ struct inode *inode = folio->mapping->host;
efs_block_t size = inode->i_size;
int err;
@@ -40,12 +39,9 @@ static int efs_symlink_read_folio(struct file *file, struct folio *folio)
brelse(bh);
}
link[size] = '\0';
- SetPageUptodate(page);
- unlock_page(page);
- return 0;
+ err = 0;
fail:
- SetPageError(page);
- unlock_page(page);
+ folio_end_read(folio, err == 0);
return err;
}
--
2.43.0
next prev parent reply other threads:[~2024-05-30 20:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-30 20:20 [PATCH 00/16] Prepare to remove PG_error Matthew Wilcox (Oracle)
2024-05-30 20:20 ` [PATCH 01/16] befs: Convert befs_symlink_read_folio() to use folio_end_read() Matthew Wilcox (Oracle)
2024-05-30 20:20 ` [PATCH 02/16] coda: Convert coda_symlink_filler() " Matthew Wilcox (Oracle)
2024-05-30 20:20 ` [PATCH 03/16] cramfs: Convert cramfs_read_folio to use a folio Matthew Wilcox (Oracle)
2024-05-30 20:20 ` Matthew Wilcox (Oracle) [this message]
2024-05-30 20:20 ` [PATCH 05/16] hpfs: Convert hpfs_symlink_read_folio " Matthew Wilcox (Oracle)
2024-05-30 20:20 ` [PATCH 06/16] isofs: Convert rock_ridge_symlink_read_folio " Matthew Wilcox (Oracle)
2024-05-30 20:20 ` [PATCH 07/16] hostfs: Convert hostfs_read_folio() " Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 08/16] jffs2: Remove calls to set/clear the folio error flag Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 09/16] nfs: Remove calls to folio_set_error Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 10/16] orangefs: Remove calls to set/clear the error flag Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 11/16] reiserfs: Remove call to folio_set_error() Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 12/16] romfs: Convert romfs_read_folio() to use a folio Matthew Wilcox (Oracle)
2024-08-12 1:46 ` Greg Ungerer
2024-08-12 3:30 ` Matthew Wilcox
2024-08-12 4:36 ` Greg Ungerer
2024-08-14 19:32 ` Matthew Wilcox
2024-08-15 12:42 ` Christian Brauner
2024-08-26 1:34 ` Greg Ungerer
2024-08-26 10:42 ` Christian Brauner
2024-05-30 20:21 ` [PATCH 13/16] ufs: Remove call to set the folio error flag Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 14/16] vboxsf: Convert vboxsf_read_folio() to use a folio Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 15/16] iomap: Remove calls to set and clear folio error flag Matthew Wilcox (Oracle)
2024-05-30 20:21 ` [PATCH 16/16] buffer: Remove calls to set and clear the " Matthew Wilcox (Oracle)
2024-05-31 10:34 ` [PATCH 00/16] Prepare to remove PG_error Christian Brauner
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=20240530202110.2653630-5-willy@infradead.org \
--to=willy@infradead.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.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 NNTP newsgroup(s).