| Message ID | 20220711041459.1062583-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/4] gfs2: stop using generic_writepages in gfs2_ail1_start_one | expand |
Hello, On Mon, Jul 11, 2022 at 7:27 AM Christoph Hellwig <hch@lst.de> wrote: > > Use filemap_fdatawrite_wbc instead of generic_writepages in > gfs2_ail1_start_one so that the functin can also cope with address_space > operations that only implement ->writepages and to properly account > for cgroup writeback. Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com> I assume you want to push this through the xfs tree. Can you add the below follow-up cleanup? Thanks, Andreas --- fs/gfs2/log.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 624dffc96136..7fc6cb95dec8 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -222,8 +222,7 @@ void gfs2_ail1_flush(struct gfs2_sbd *sdp, struct writeback_control *wbc) spin_unlock(&sdp->sd_ail_lock); blk_finish_plug(&plug); if (ret) { - gfs2_lm(sdp, "gfs2_ail1_start_one (generic_writepages) " - "returned: %d\n", ret); + gfs2_lm(sdp, "gfs2_ail1_start_one returned %d\n", ret); gfs2_withdraw(sdp); } trace_gfs2_ail_flush(sdp, wbc, 0);
On Mon, Jul 11, 2022 at 12:27:47PM +0200, Andreas Gruenbacher wrote: > Can you add the below follow-up cleanup? > - gfs2_lm(sdp, "gfs2_ail1_start_one (generic_writepages) " > - "returned: %d\n", ret); > + gfs2_lm(sdp, "gfs2_ail1_start_one returned %d\n", ret); The cleanup looks fine to me, yes.
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index f0ee3ff6f9a87..624dffc96136b 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -131,7 +131,7 @@ __acquires(&sdp->sd_ail_lock) if (!mapping) continue; spin_unlock(&sdp->sd_ail_lock); - ret = generic_writepages(mapping, wbc); + ret = filemap_fdatawrite_wbc(mapping, wbc); if (need_resched()) { blk_finish_plug(plug); cond_resched();
Use filemap_fdatawrite_wbc instead of generic_writepages in gfs2_ail1_start_one so that the functin can also cope with address_space operations that only implement ->writepages and to properly account for cgroup writeback. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/gfs2/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)