diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-15 10:41:01 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-15 10:41:01 +0200 |
| commit | e6218bf390a9992de86a535bcb227f75e2c20cf9 (patch) | |
| tree | b6bfa2374c78fedacb683b4da91afac3300807ba /mm/backing-dev.c | |
| parent | 77bade677c3c5616dfadfd21f0220fcddbfa4cbe (diff) | |
| parent | 35cd67a0caf767aba472452865dcb4471fcce2b1 (diff) | |
Merge branch 'i2c/for-current-fixed' into i2c/for-4.18
Diffstat (limited to 'mm/backing-dev.c')
| -rw-r--r-- | mm/backing-dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 023190c69dce..7441bd93b732 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -115,6 +115,7 @@ static int bdi_debug_register(struct backing_dev_info *bdi, const char *name) bdi, &bdi_debug_stats_fops); if (!bdi->debug_stats) { debugfs_remove(bdi->debug_dir); + bdi->debug_dir = NULL; return -ENOMEM; } @@ -383,7 +384,7 @@ static void wb_shutdown(struct bdi_writeback *wb) * the barrier provided by test_and_clear_bit() above. */ smp_wmb(); - clear_bit(WB_shutting_down, &wb->state); + clear_and_wake_up_bit(WB_shutting_down, &wb->state); } static void wb_exit(struct bdi_writeback *wb) |