From patchwork Mon Dec 20 19:15:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 422101 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBL0RA8r011307 for ; Tue, 21 Dec 2010 00:31:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932929Ab0LTTPe (ORCPT ); Mon, 20 Dec 2010 14:15:34 -0500 Received: from cobra.newdream.net ([66.33.216.30]:41941 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932628Ab0LTTPe (ORCPT ); Mon, 20 Dec 2010 14:15:34 -0500 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTPA id 1EEF6BC80F; Mon, 20 Dec 2010 11:20:58 -0800 (PST) From: Sage Weil To: ceph-devel@vger.kernel.org Cc: Sage Weil Subject: [PATCH 1/5] ceph: fix msgr_init error path Date: Mon, 20 Dec 2010 11:15:27 -0800 Message-Id: <1292872531-18396-2-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1292872531-18396-1-git-send-email-sage@newdream.net> References: <1292872531-18396-1-git-send-email-sage@newdream.net> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 00:31:04 +0000 (UTC) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 1c7a2ec..b6ff4a1 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -97,11 +97,9 @@ struct workqueue_struct *ceph_msgr_wq; int ceph_msgr_init(void) { ceph_msgr_wq = create_workqueue("ceph-msgr"); - if (IS_ERR(ceph_msgr_wq)) { - int ret = PTR_ERR(ceph_msgr_wq); - pr_err("msgr_init failed to create workqueue: %d\n", ret); - ceph_msgr_wq = NULL; - return ret; + if (!ceph_msgr_wq) { + pr_err("msgr_init failed to create workqueue\n"); + return -ENOMEM; } return 0; }