Unverified Commit d15b00b1 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Christian Brauner
Browse files

jffs2: Remove calls to set/clear the folio error flag 



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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20240530202110.2653630-9-willy@infradead.org


Tested-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent e3ec0fe9

fs/jffs2/file.c

+3 −11
Original line number Diff line number Diff line
@@ -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);

	}