Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton: "A few final bits: - large changes to vmalloc, yielding large performance benefits - tweak the console-flush-on-panic code - a few fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: panic: add an option to replay all the printk message in buffer initramfs: don't free a non-existent initrd fs/writeback.c: use rcu_barrier() to wait for inflight wb switches going into workqueue when umount mm/compaction.c: correct zone boundary handling when isolating pages from a pageblock mm/vmap: add DEBUG_AUGMENT_LOWEST_MATCH_CHECK macro mm/vmap: add DEBUG_AUGMENT_PROPAGATE_CHECK macro mm/vmalloc.c: keep track of free blocks for vmap allocation
This commit is contained in:
@@ -523,8 +523,6 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)
|
||||
|
||||
isw->inode = inode;
|
||||
|
||||
atomic_inc(&isw_nr_in_flight);
|
||||
|
||||
/*
|
||||
* In addition to synchronizing among switchers, I_WB_SWITCH tells
|
||||
* the RCU protected stat update paths to grab the i_page
|
||||
@@ -532,6 +530,9 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)
|
||||
* Let's continue after I_WB_SWITCH is guaranteed to be visible.
|
||||
*/
|
||||
call_rcu(&isw->rcu_head, inode_switch_wbs_rcu_fn);
|
||||
|
||||
atomic_inc(&isw_nr_in_flight);
|
||||
|
||||
goto out_unlock;
|
||||
|
||||
out_free:
|
||||
@@ -901,7 +902,11 @@ restart:
|
||||
void cgroup_writeback_umount(void)
|
||||
{
|
||||
if (atomic_read(&isw_nr_in_flight)) {
|
||||
synchronize_rcu();
|
||||
/*
|
||||
* Use rcu_barrier() to wait for all pending callbacks to
|
||||
* ensure that all in-flight wb switches are in the workqueue.
|
||||
*/
|
||||
rcu_barrier();
|
||||
flush_workqueue(isw_wq);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user