diff options
Diffstat (limited to 'mm/page-writeback.c')
-rw-r--r-- | mm/page-writeback.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index f7e088f5a309..f469e3cd08e8 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -296,11 +296,21 @@ void balance_dirty_pages_ratelimited_nr(struct address_space *mapping, | |||
296 | } | 296 | } |
297 | EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr); | 297 | EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr); |
298 | 298 | ||
299 | void throttle_vm_writeout(void) | 299 | void throttle_vm_writeout(gfp_t gfp_mask) |
300 | { | 300 | { |
301 | long background_thresh; | 301 | long background_thresh; |
302 | long dirty_thresh; | 302 | long dirty_thresh; |
303 | 303 | ||
304 | if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO)) { | ||
305 | /* | ||
306 | * The caller might hold locks which can prevent IO completion | ||
307 | * or progress in the filesystem. So we cannot just sit here | ||
308 | * waiting for IO to complete. | ||
309 | */ | ||
310 | congestion_wait(WRITE, HZ/10); | ||
311 | return; | ||
312 | } | ||
313 | |||
304 | for ( ; ; ) { | 314 | for ( ; ; ) { |
305 | get_dirty_limits(&background_thresh, &dirty_thresh, NULL); | 315 | get_dirty_limits(&background_thresh, &dirty_thresh, NULL); |
306 | 316 | ||
@@ -317,7 +327,6 @@ void throttle_vm_writeout(void) | |||
317 | } | 327 | } |
318 | } | 328 | } |
319 | 329 | ||
320 | |||
321 | /* | 330 | /* |
322 | * writeback at least _min_pages, and keep writing until the amount of dirty | 331 | * writeback at least _min_pages, and keep writing until the amount of dirty |
323 | * memory is less than the background threshold, or until we're all clean. | 332 | * memory is less than the background threshold, or until we're all clean. |