mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-12-26 05:45:53 +00:00
writeback: remove unnecessary wait in throttle_vm_writeout()
We don't want to introduce pointless delays in throttle_vm_writeout() when the writeback limits are not yet exceeded, do we? Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Pete Zaitcev <zaitcev@redhat.com> Cc: Greg KH <greg@kroah.com> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1c0eeaf569
commit
369f2389e7
@ -502,16 +502,6 @@ void throttle_vm_writeout(gfp_t gfp_mask)
|
||||
long background_thresh;
|
||||
long dirty_thresh;
|
||||
|
||||
if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO)) {
|
||||
/*
|
||||
* The caller might hold locks which can prevent IO completion
|
||||
* or progress in the filesystem. So we cannot just sit here
|
||||
* waiting for IO to complete.
|
||||
*/
|
||||
congestion_wait(WRITE, HZ/10);
|
||||
return;
|
||||
}
|
||||
|
||||
for ( ; ; ) {
|
||||
get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL);
|
||||
|
||||
@ -525,6 +515,14 @@ void throttle_vm_writeout(gfp_t gfp_mask)
|
||||
global_page_state(NR_WRITEBACK) <= dirty_thresh)
|
||||
break;
|
||||
congestion_wait(WRITE, HZ/10);
|
||||
|
||||
/*
|
||||
* The caller might hold locks which can prevent IO completion
|
||||
* or progress in the filesystem. So we cannot just sit here
|
||||
* waiting for IO to complete.
|
||||
*/
|
||||
if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user