diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
| commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
| tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /include/linux/backing-dev-defs.h | |
| parent | sched/fair: Remove stale tg_unthrottle_up() comments (diff) | |
| parent | kthread, sched/core: Fix kthread_parkme() (again...) (diff) | |
| download | linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/backing-dev-defs.h')
| -rw-r--r-- | include/linux/backing-dev-defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index 0bd432a4d7bd..24251762c20c 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -22,7 +22,6 @@ struct dentry; */ enum wb_state { WB_registered, /* bdi_register() was done */ - WB_shutting_down, /* wb_shutdown() in progress */ WB_writeback_running, /* Writeback is in progress */ WB_has_dirty_io, /* Dirty inodes on ->b_{dirty|io|more_io} */ WB_start_all, /* nr_pages == 0 (all) work pending */ @@ -189,6 +188,7 @@ struct backing_dev_info { #ifdef CONFIG_CGROUP_WRITEBACK struct radix_tree_root cgwb_tree; /* radix tree of active cgroup wbs */ struct rb_root cgwb_congested_tree; /* their congested states */ + struct mutex cgwb_release_mutex; /* protect shutdown of wb structs */ #else struct bdi_writeback_congested *wb_congested; #endif |