[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1292254105-3952-1-git-send-email-namhyung@gmail.com>
Date: Tue, 14 Dec 2010 00:28:25 +0900
From: Namhyung Kim <namhyung@...il.com>
To: Christine Caulfield <ccaulfie@...hat.com>,
David Teigland <teigland@...hat.com>
Cc: cluster-devel@...hat.com, linux-kernel@...r.kernel.org,
Tejun Heo <tj@...nel.org>
Subject: [PATCH] dlm: sanitize work_start() in lowcomms.c
The create_workqueue() returns NULL if failed rather than ERR_PTR().
Fix error checking and remove unnecessary variable 'error'.
Signed-off-by: Namhyung Kim <namhyung@...il.com>
Cc: Tejun Heo <tj@...nel.org>
---
fs/dlm/lowcomms.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 37a34c2c622a..ea04e87b8666 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1430,20 +1430,18 @@ static void work_stop(void)
static int work_start(void)
{
- int error;
recv_workqueue = create_workqueue("dlm_recv");
- error = IS_ERR(recv_workqueue);
- if (error) {
- log_print("can't start dlm_recv %d", error);
- return error;
+ if (!recv_workqueue) {
+ log_print("can't start dlm_recv");
+ return -ENOMEM;
}
send_workqueue = create_singlethread_workqueue("dlm_send");
- error = IS_ERR(send_workqueue);
- if (error) {
- log_print("can't start dlm_send %d", error);
+ if (!send_workqueue) {
+ log_print("can't start dlm_send");
destroy_workqueue(recv_workqueue);
- return error;
+ recv_workqueue = NULL;
+ return -ENOMEM;
}
return 0;
--
1.7.3.3.400.g93cef
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists