From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756841AbbJHLd6 (ORCPT ); Thu, 8 Oct 2015 07:33:58 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46181 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756806AbbJHLdz (ORCPT ); Thu, 8 Oct 2015 07:33:55 -0400 X-Sasl-enc: 1UXYhTQ/kdfmsqhzHekGQygfvl9WEbJ0e0ILnhtKNTfB 1444304032 From: Sergei Zviagintsev To: Greg Kroah-Hartman , Daniel Mack , David Herrmann , Djalal Harouni Cc: linux-kernel@vger.kernel.org, Sergei Zviagintsev Subject: [PATCH 26/44] kdbus: Cleanup kdbus_pin_dst() Date: Thu, 8 Oct 2015 14:31:55 +0300 Message-Id: <461a280fc343eab2605a7ee2f08f193b334cc970.1444302968.git.sergei@s15v.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - Reduce scope of `owner' var to the block where it is actually used. Use conditional operator to set its value. - Drop initialization of `dst' as it gets value later. - Drop separate exit point as we have only one use case of it. Signed-off-by: Sergei Zviagintsev --- ipc/kdbus/connection.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c index 6a73ac3f444d..ace587ee951a 100644 --- a/ipc/kdbus/connection.c +++ b/ipc/kdbus/connection.c @@ -1048,10 +1048,8 @@ static int kdbus_pin_dst(struct kdbus_bus *bus, struct kdbus_conn **out_dst) { const struct kdbus_msg *msg = staging->msg; - struct kdbus_name_owner *owner = NULL; struct kdbus_name_entry *name = NULL; - struct kdbus_conn *dst = NULL; - int ret; + struct kdbus_conn *dst; lockdep_assert_held(&bus->name_registry->rwlock); @@ -1061,14 +1059,15 @@ static int kdbus_pin_dst(struct kdbus_bus *bus, return -ENXIO; if (!kdbus_conn_is_ordinary(dst)) { - ret = -ENXIO; - goto error; + kdbus_conn_unref(dst); + return -ENXIO; } } else { + struct kdbus_name_owner *owner; + name = kdbus_name_lookup_unlocked(bus->name_registry, staging->dst_name); - if (name) - owner = kdbus_name_get_owner(name); + owner = name ? kdbus_name_get_owner(name) : NULL; if (!owner) return -ESRCH; @@ -1094,10 +1093,6 @@ static int kdbus_pin_dst(struct kdbus_bus *bus, *out_name = name; *out_dst = dst; return 0; - -error: - kdbus_conn_unref(dst); - return ret; } static int kdbus_conn_reply(struct kdbus_conn *src, -- 1.8.3.1