Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gfs2: Remove __gfs2_writepage()

Browse Source 
Call aops->writepages() instead of using write_cache_pages() to call
aops->writepage.  Change the handling of -ENODATA to not set the
persistent error on the block device.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-07-19 18:51:02 +01:00 committed by Andreas Gruenbacher
parent 901849e707
commit 8d391972ae
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/gfs2/log.c
View File

@ -80,15 +80,6 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd)
brelse(bd->bd_bh); brelse(bd->bd_bh);
} }
static int __gfs2_writepage(struct folio *folio, struct writeback_control *wbc,
void *data)
{
struct address_space *mapping = data;
int ret = mapping->a_ops->writepage(&folio->page, wbc);
mapping_set_error(mapping, ret);
return ret;
}
/** /**
* gfs2_ail1_start_one - Start I/O on a transaction * gfs2_ail1_start_one - Start I/O on a transaction
* @sdp: The superblock * @sdp: The superblock
@ -140,7 +131,7 @@ __acquires(&sdp->sd_ail_lock)
if (!mapping) if (!mapping)
continue; continue;
spin_unlock(&sdp->sd_ail_lock); spin_unlock(&sdp->sd_ail_lock);
ret = write_cache_pages(mapping, wbc, __gfs2_writepage, mapping); ret = mapping->a_ops->writepages(mapping, wbc);
if (need_resched()) { if (need_resched()) {
blk_finish_plug(plug); blk_finish_plug(plug);
cond_resched(); cond_resched();
@ -149,6 +140,7 @@ __acquires(&sdp->sd_ail_lock)
spin_lock(&sdp->sd_ail_lock); spin_lock(&sdp->sd_ail_lock);
if (ret == -ENODATA) /* if a jdata write into a new hole */ if (ret == -ENODATA) /* if a jdata write into a new hole */
ret = 0; /* ignore it */ ret = 0; /* ignore it */
mapping_set_error(mapping, ret);
if (ret || wbc->nr_to_write <= 0) if (ret || wbc->nr_to_write <= 0)
break; break;
return -EBUSY; return -EBUSY;