Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932429AbbFQRPn (ORCPT ); Wed, 17 Jun 2015 13:15:43 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40591 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600AbbFQRPK (ORCPT ); Wed, 17 Jun 2015 13:15:10 -0400 X-Sasl-enc: f1WaZnAB9guR9IfVjeABZG1K/diujVeKHO5Mbwdd29RV 1434561309 From: Sergei Zviagintsev To: Greg Kroah-Hartman , Daniel Mack , David Herrmann , Djalal Harouni Cc: linux-kernel@vger.kernel.org, Sergei Zviagintsev Subject: [PATCH 2/3] kdbus: optimize error path in kdbus_reply_new() Date: Wed, 17 Jun 2015 20:14:57 +0300 Message-Id: <1434561298-4576-3-git-send-email-sergei@s15v.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1434561298-4576-1-git-send-email-sergei@s15v.net> References: <1434561298-4576-1-git-send-email-sergei@s15v.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1320 Lines: 47 Move cleanup code to separate location as it never executes on normal flow. This removes extra if-block and the need to initialize `ret'. Signed-off-by: Sergei Zviagintsev --- ipc/kdbus/reply.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ipc/kdbus/reply.c b/ipc/kdbus/reply.c index 9d823ebee71f..e6791d86ec92 100644 --- a/ipc/kdbus/reply.c +++ b/ipc/kdbus/reply.c @@ -37,7 +37,7 @@ struct kdbus_reply *kdbus_reply_new(struct kdbus_conn *reply_src, bool sync) { struct kdbus_reply *r; - int ret = 0; + int ret; if (atomic_inc_return(&reply_dst->request_count) > KDBUS_CONN_MAX_REQUESTS_PENDING) { @@ -64,13 +64,11 @@ struct kdbus_reply *kdbus_reply_new(struct kdbus_conn *reply_src, r->waiting = true; } -exit_dec_request_count: - if (ret < 0) { - atomic_dec(&reply_dst->request_count); - return ERR_PTR(ret); - } - return r; + +exit_dec_request_count: + atomic_dec(&reply_dst->request_count); + return ERR_PTR(ret); } static void __kdbus_reply_free(struct kref *kref) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/