jffs2: Remove calls to set/clear the folio error flag
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 30 May 2024 20:21:00 +0000 (21:21 +0100)
committerChristian Brauner <brauner@kernel.org>
Fri, 31 May 2024 10:31:41 +0000 (12:31 +0200)
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>
Link: https://lore.kernel.org/r/20240530202110.2653630-9-willy@infradead.org
Tested-by: Zhihao Cheng <chengzhihao1@huawei.com>
Acked-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/jffs2/file.c

index 62ea76d..e12cb14 100644 (file)
@@ -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);
        }