From e3b92c600e80ed569e9c77600fee557cfaa10c24 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 1 Apr 2013 11:23:31 -0700 Subject: [PATCH] --- yaml --- r: 365541 b: refs/heads/master c: 4862125b0256a946d2749a1d5003b0604bc3cb4d h: refs/heads/master i: 365539: 0940a7b452033d2341234f1a76afb6afd1e0abf3 v: v3 --- [refs] | 2 +- trunk/kernel/workqueue.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 92ae83177a9a..a8524fd1424f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13e2e556013a543eebd238d1c2759195e3c0c9fc +refs/heads/master: 4862125b0256a946d2749a1d5003b0604bc3cb4d diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index abe1f0da4600..89480fc8eaa3 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -3636,6 +3636,7 @@ int apply_workqueue_attrs(struct workqueue_struct *wq, struct workqueue_attrs *new_attrs; struct pool_workqueue *pwq = NULL, *last_pwq; struct worker_pool *pool; + int ret; /* only unbound workqueues can change attributes */ if (WARN_ON(!(wq->flags & WQ_UNBOUND))) @@ -3668,12 +3669,16 @@ int apply_workqueue_attrs(struct workqueue_struct *wq, spin_unlock_irq(&last_pwq->pool->lock); } - return 0; + ret = 0; + /* fall through */ +out_free: + free_workqueue_attrs(new_attrs); + return ret; enomem: kmem_cache_free(pwq_cache, pwq); - free_workqueue_attrs(new_attrs); - return -ENOMEM; + ret = -ENOMEM; + goto out_free; } static int alloc_and_link_pwqs(struct workqueue_struct *wq)