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,
David Woodhouse <dwmw2@infradead.org>,
linux-mtd@lists.infradead.org,
Zhihao Cheng <chengzhihao1@huawei.com>,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 08/16] jffs2: Remove calls to set/clear the folio error flag
Date: Thu, 30 May 2024 21:21:00 +0100 [thread overview]
Message-ID: <20240530202110.2653630-9-willy@infradead.org> (raw)
In-Reply-To: <20240530202110.2653630-1-willy@infradead.org>
Nobody checks the error flag on jffs2 folios, so stop setting and
clearing it. We can also remove the call to clear the uptodate
flag; it will already be clear.
Convert one of these into a call to mapping_set_error() which will
actually be checked by other parts of the kernel.
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Acked-by: Richard Weinberger <richard@nod.at>
---
fs/jffs2/file.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 62ea76da7fdf..e12cb145147e 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -95,13 +95,8 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
ret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_SHIFT,
PAGE_SIZE);
- if (ret) {
- ClearPageUptodate(pg);
- SetPageError(pg);
- } else {
+ if (!ret)
SetPageUptodate(pg);
- ClearPageError(pg);
- }
flush_dcache_page(pg);
kunmap(pg);
@@ -304,10 +299,8 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
kunmap(pg);
- if (ret) {
- /* There was an error writing. */
- SetPageError(pg);
- }
+ if (ret)
+ mapping_set_error(mapping, ret);
/* Adjust writtenlen for the padding we did, so we don't confuse our caller */
writtenlen -= min(writtenlen, (start - aligned_start));
@@ -330,7 +323,6 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
it gets reread */
jffs2_dbg(1, "%s(): Not all bytes written. Marking page !uptodate\n",
__func__);
- SetPageError(pg);
ClearPageUptodate(pg);
}
--
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 ` [PATCH 04/16] efs: Convert efs_symlink_read_folio " Matthew Wilcox (Oracle)
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 ` Matthew Wilcox (Oracle) [this message]
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-9-willy@infradead.org \
--to=willy@infradead.org \
--cc=brauner@kernel.org \
--cc=chengzhihao1@huawei.com \
--cc=dwmw2@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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).