Commit 369f2389 authored by Fengguang Wu's avatar Fengguang Wu Committed by Linus Torvalds

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: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarFengguang Wu <wfg@mail.ustc.edu.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c0eeaf5
...@@ -502,16 +502,6 @@ void throttle_vm_writeout(gfp_t gfp_mask) ...@@ -502,16 +502,6 @@ void throttle_vm_writeout(gfp_t gfp_mask)
long background_thresh; long background_thresh;
long dirty_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 ( ; ; ) { for ( ; ; ) {
get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL); get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL);
...@@ -525,6 +515,14 @@ void throttle_vm_writeout(gfp_t gfp_mask) ...@@ -525,6 +515,14 @@ void throttle_vm_writeout(gfp_t gfp_mask)
global_page_state(NR_WRITEBACK) <= dirty_thresh) global_page_state(NR_WRITEBACK) <= dirty_thresh)
break; break;
congestion_wait(WRITE, HZ/10); 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;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment