Commit 3c006ad7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v6.2-rc4-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 writepage fix from Andreas Gruenbacher:

 - Fix a regression introduced by commit "gfs2: stop using
   generic_writepages in gfs2_ail1_start_one".

* tag 'gfs2-v6.2-rc4-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  Revert "gfs2: stop using generic_writepages in gfs2_ail1_start_one"
parents 2241ab53 95ecbd0f

fs/gfs2/log.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -80,6 +80,15 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd) 
	brelse(bd->bd_bh);

	brelse(bd->bd_bh);

}

}





static int __gfs2_writepage(struct page *page, struct writeback_control *wbc,

		       void *data)

{

	struct address_space *mapping = data;

	int ret = mapping->a_ops->writepage(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
@@ -131,7 +140,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 = filemap_fdatawrite_wbc(mapping, wbc);

		ret = write_cache_pages(mapping, wbc, __gfs2_writepage, mapping);

		if (need_resched()) {

		if (need_resched()) {

			blk_finish_plug(plug);

			blk_finish_plug(plug);

			cond_resched();

			cond_resched();