unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

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

Browse source 
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>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-05-30 21:21:00 +01:00 committed by Christian Brauner
parent e3ec0fe944
commit d15b00b1e5
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/jffs2/file.c
View 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, ret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_SHIFT,
PAGE_SIZE); PAGE_SIZE);
if (ret) { if (!ret)
ClearPageUptodate(pg);
SetPageError(pg);
} else {
SetPageUptodate(pg); SetPageUptodate(pg);
ClearPageError(pg);
}
flush_dcache_page(pg); flush_dcache_page(pg);
kunmap(pg); kunmap(pg);
@ -304,10 +299,8 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
kunmap(pg); kunmap(pg);
if (ret) { if (ret)
/* There was an error writing. */ mapping_set_error(mapping, ret);
SetPageError(pg);
}
/* Adjust writtenlen for the padding we did, so we don't confuse our caller */ /* Adjust writtenlen for the padding we did, so we don't confuse our caller */
writtenlen -= min(writtenlen, (start - aligned_start)); 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 */ it gets reread */
jffs2_dbg(1, "%s(): Not all bytes written. Marking page !uptodate\n", jffs2_dbg(1, "%s(): Not all bytes written. Marking page !uptodate\n",
__func__); __func__);
SetPageError(pg);
ClearPageUptodate(pg); ClearPageUptodate(pg);
} }