diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-06-22 05:32:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-06-22 05:32:41 -0400 |
commit | 57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (patch) | |
tree | b0bb4e4a6e04a24119da30253add9fe9ffbc8d22 /mm/backing-dev.c | |
parent | f267f9dff8ba00a8b11f340da3634858ad50ebab (diff) | |
parent | c99d49a8f81fb35e67b0ffa45f320a75e0b5639d (diff) |
Merge tag 'asoc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Further updates for v4.2
There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.
Diffstat (limited to 'mm/backing-dev.c')
-rw-r--r-- | mm/backing-dev.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 6dc4580df2af..000e7b3b9896 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c | |||
@@ -359,23 +359,6 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi) | |||
359 | flush_delayed_work(&bdi->wb.dwork); | 359 | flush_delayed_work(&bdi->wb.dwork); |
360 | } | 360 | } |
361 | 361 | ||
362 | /* | ||
363 | * Called when the device behind @bdi has been removed or ejected. | ||
364 | * | ||
365 | * We can't really do much here except for reducing the dirty ratio at | ||
366 | * the moment. In the future we should be able to set a flag so that | ||
367 | * the filesystem can handle errors at mark_inode_dirty time instead | ||
368 | * of only at writeback time. | ||
369 | */ | ||
370 | void bdi_unregister(struct backing_dev_info *bdi) | ||
371 | { | ||
372 | if (WARN_ON_ONCE(!bdi->dev)) | ||
373 | return; | ||
374 | |||
375 | bdi_set_min_ratio(bdi, 0); | ||
376 | } | ||
377 | EXPORT_SYMBOL(bdi_unregister); | ||
378 | |||
379 | static void bdi_wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi) | 362 | static void bdi_wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi) |
380 | { | 363 | { |
381 | memset(wb, 0, sizeof(*wb)); | 364 | memset(wb, 0, sizeof(*wb)); |
@@ -443,6 +426,7 @@ void bdi_destroy(struct backing_dev_info *bdi) | |||
443 | int i; | 426 | int i; |
444 | 427 | ||
445 | bdi_wb_shutdown(bdi); | 428 | bdi_wb_shutdown(bdi); |
429 | bdi_set_min_ratio(bdi, 0); | ||
446 | 430 | ||
447 | WARN_ON(!list_empty(&bdi->work_list)); | 431 | WARN_ON(!list_empty(&bdi->work_list)); |
448 | WARN_ON(delayed_work_pending(&bdi->wb.dwork)); | 432 | WARN_ON(delayed_work_pending(&bdi->wb.dwork)); |