mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Christoph Hellwig <hch@lst.de> Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
		
							parent
							
								
									f8189d5d5f
								
							
						
					
					
						commit
						b2b0a5e978
					
				
					 1 changed files with 2 additions and 3 deletions
				
			
		| 
						 | 
					@ -131,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 = generic_writepages(mapping, wbc);
 | 
							ret = filemap_fdatawrite_wbc(mapping, wbc);
 | 
				
			||||||
		if (need_resched()) {
 | 
							if (need_resched()) {
 | 
				
			||||||
			blk_finish_plug(plug);
 | 
								blk_finish_plug(plug);
 | 
				
			||||||
			cond_resched();
 | 
								cond_resched();
 | 
				
			||||||
| 
						 | 
					@ -222,8 +222,7 @@ void gfs2_ail1_flush(struct gfs2_sbd *sdp, struct writeback_control *wbc)
 | 
				
			||||||
	spin_unlock(&sdp->sd_ail_lock);
 | 
						spin_unlock(&sdp->sd_ail_lock);
 | 
				
			||||||
	blk_finish_plug(&plug);
 | 
						blk_finish_plug(&plug);
 | 
				
			||||||
	if (ret) {
 | 
						if (ret) {
 | 
				
			||||||
		gfs2_lm(sdp, "gfs2_ail1_start_one (generic_writepages) "
 | 
							gfs2_lm(sdp, "gfs2_ail1_start_one returned: %d\n", ret);
 | 
				
			||||||
			"returned: %d\n", ret);
 | 
					 | 
				
			||||||
		gfs2_withdraw(sdp);
 | 
							gfs2_withdraw(sdp);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	trace_gfs2_ail_flush(sdp, wbc, 0);
 | 
						trace_gfs2_ail_flush(sdp, wbc, 0);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue