Commit b2b0a5e9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

gfs2: stop using generic_writepages in gfs2_ail1_start_one 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent f8189d5d

fs/gfs2/log.c

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