linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: wanghaibin <wanghaibin.wang@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: <tj@kernel.org>, <jiangshanlai@gmail.com>,
	<peter.huangpeng@huawei.com>,
	wanghaibin <wanghaibin.wang@huawei.com>
Subject: [RFC PATCH 4/4] workqueue: simplify the apply_workqueue_attrs_locked function.
Date: Thu, 7 Jan 2016 20:38:59 +0800	[thread overview]
Message-ID: <1452170339-26748-5-git-send-email-wanghaibin.wang@huawei.com> (raw)
In-Reply-To: <1452170339-26748-1-git-send-email-wanghaibin.wang@huawei.com>

if the apply_wqattrs_prepare function return NULL, in its implement, it has already
clear up the related resource, so, it can return failed directly, to avoid to call
the clean up function again.

this doesn't introduce any functional changes, just a suggestion.

Signed-off-by: wanghaibin <wanghaibin.wang@huawei.com>
---
 kernel/workqueue.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index d6527dc..9c9a27e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3601,7 +3601,6 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,
 					const struct workqueue_attrs *attrs)
 {
 	struct apply_wqattrs_ctx *ctx;
-	int ret = -ENOMEM;
 
 	/* only unbound workqueues can change attributes */
 	if (WARN_ON(!(wq->flags & WQ_UNBOUND)))
@@ -3612,16 +3611,14 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,
 		return -EINVAL;
 
 	ctx = apply_wqattrs_prepare(wq, attrs);
+	if (!ctx)
+		return -ENOMEM;
 
 	/* the ctx has been prepared successfully, let's commit it */
-	if (ctx) {
-		apply_wqattrs_commit(ctx);
-		ret = 0;
-	}
-
+	apply_wqattrs_commit(ctx);
 	apply_wqattrs_cleanup(ctx);
 
-	return ret;
+	return 0;
 }
 
 /**
-- 
1.8.3.1



  parent reply	other threads:[~2016-01-07 12:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-07 12:38 [RFC PATCH 0/4] fixs/suggestions for workqueue subsystem wanghaibin
2016-01-07 12:38 ` [RFC PATCH 1/4] workqueue: move the wq_update_unbound_numa_attrs_buf allocation location wanghaibin
2016-01-07 15:48   ` Tejun Heo
2016-01-11  5:21     ` wanghaibin
2016-01-07 12:38 ` [RFC PATCH 2/4] workqueue: free the allocated memory resource when wq_numa_init failed wanghaibin
2016-01-07 15:50   ` Tejun Heo
2016-01-11  4:26     ` wanghaibin
2016-01-07 12:38 ` [RFC PATCH 3/4] workqueue: remove the unbind workqueue attr sys_file before unregister the workqueue device wanghaibin
2016-01-07 16:00   ` Tejun Heo
2016-01-11 12:23     ` wanghaibin
2016-01-07 12:38 ` wanghaibin [this message]
2016-01-07 16:07   ` [RFC PATCH 4/4] workqueue: simplify the apply_workqueue_attrs_locked function Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452170339-26748-5-git-send-email-wanghaibin.wang@huawei.com \
    --to=wanghaibin.wang@huawei.com \
    --cc=jiangshanlai@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.huangpeng@huawei.com \
    --cc=tj@kernel.org \
    --subject='Re: [RFC PATCH 4/4] workqueue: simplify the apply_workqueue_attrs_locked function.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).