diff options
| author | Jens Axboe <axboe@fb.com> | 2015-06-04 15:21:50 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-06-04 15:21:50 -0600 |
| commit | 613a2e5fb8db8dae722ee80dabc216bb65cb1a86 (patch) | |
| tree | c00c73ed7916d3c98955842594f4c79ffe3a5f61 | |
| parent | 829f3572b2b480e15a356b00b613477241235a64 (diff) | |
| parent | 5857cd637bc0d60dc7e37af396b01324f199d89b (diff) | |
| download | linux-next-613a2e5fb8db8dae722ee80dabc216bb65cb1a86.tar.gz | |
Merge branch 'for-4.2/writeback' into for-next
| -rw-r--r-- | mm/backing-dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 887d72a85b5e1a..436bb53dd383f2 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -554,8 +554,10 @@ static int cgwb_create(struct backing_dev_info *bdi, goto err_ref_exit; wb->congested = wb_congested_get_create(bdi, blkcg_css->id, gfp); - if (!wb->congested) + if (!wb->congested) { + ret = -ENOMEM; goto err_fprop_exit; + } wb->memcg_css = memcg_css; wb->blkcg_css = blkcg_css; |