DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "backing-dev: ensure wakeup_timer is deleted" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-02-08 04:33:06 -08:00
committed by QuIC Gerrit Code Review
parent 32e59b5624 0fc4d13984
commit ae027cb3ec
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mm/backing-dev.c
View File

@@ -686,6 +686,14 @@ void bdi_destroy(struct backing_dev_info *bdi)
bdi_unregister(bdi); bdi_unregister(bdi);
/*
* If bdi_unregister() had already been called earlier, the
* wakeup_timer could still be armed because bdi_prune_sb()
* can race with the bdi_wakeup_thread_delayed() calls from
* __mark_inode_dirty().
*/
del_timer_sync(&bdi->wb.wakeup_timer);
for (i = 0; i < NR_BDI_STAT_ITEMS; i++) for (i = 0; i < NR_BDI_STAT_ITEMS; i++)
percpu_counter_destroy(&bdi->bdi_stat[i]); percpu_counter_destroy(&bdi->bdi_stat[i]);