diff options
| author | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-03-02 13:53:48 -0800 |
| commit | 837de638dc019843efb0f8744e299769af32e004 (patch) | |
| tree | 3f693d421593332edcdf1d877433d31e9f1525de /mm | |
| parent | f04805218728192d346291c1a0e78cb184142bad (diff) | |
| parent | dd4534d88b93a911983503851ec9441787a4997d (diff) | |
Merge branch 'upstream-linux-4.4.y' into android-4.4
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/backing-dev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 9ef80bf441b3..a988d4ef39da 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -757,15 +757,20 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) if (!bdi->wb_congested) return -ENOMEM; + atomic_set(&bdi->wb_congested->refcnt, 1); + err = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL); if (err) { - kfree(bdi->wb_congested); + wb_congested_put(bdi->wb_congested); return err; } return 0; } -static void cgwb_bdi_destroy(struct backing_dev_info *bdi) { } +static void cgwb_bdi_destroy(struct backing_dev_info *bdi) +{ + wb_congested_put(bdi->wb_congested); +} #endif /* CONFIG_CGROUP_WRITEBACK */ |