kdbus: use kdbus_conn_find_peer() where appropriate

Signed-off-by: Djalal Harouni <tixxdz@opendz.org>

diff --git a/connection.c b/connection.c
index 97fde972bbd9967ed80db22633affabfef373be3..f14cedce53d09bdef88c1e444d5b08bc5913b134 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -1752,11 +1752,8 @@ int kdbus_cmd_conn_info(struct kdbus_conn *conn,
                }
 
                name = cmd_info->name;
-       } else {
-               mutex_lock(&conn->bus->lock);
-               owner_conn = kdbus_bus_find_conn_by_id(conn->bus, cmd_info->id);
-               mutex_unlock(&conn->bus->lock);
-       }
+       } else
+               owner_conn = kdbus_conn_find_peer(conn, cmd_info->id);
 
        /*
         * If a lookup by name was requested, set owner_conn to the

diff --git a/match.c b/match.c
index 4a12a24300b00eaf8219afc26a302f8a07696eb4..ccc4042bb338c52c871b6658e26e119cb79bfea7 100644 (file)
--- a/match.c
+++ b/match.c
@@ -358,12 +358,7 @@ int kdbus_match_db_add(struct kdbus_conn *conn,
                return -EPERM;
 
        if (cmd->owner_id != 0 && cmd->owner_id != conn->id) {
-               struct kdbus_bus *bus = conn->bus;
-
-               mutex_lock(&bus->lock);
-               target_conn = kdbus_bus_find_conn_by_id(bus, cmd->owner_id);
-               mutex_unlock(&bus->lock);
-
+               target_conn = kdbus_conn_find_peer(conn, cmd->owner_id);
                if (!target_conn) {
                        ret = -ENXIO;
                        goto exit_free;
@@ -534,12 +529,7 @@ int kdbus_match_db_remove(struct kdbus_conn *conn,
                return -EPERM;
 
        if (cmd->owner_id != 0 && cmd->owner_id != conn->id) {
-               struct kdbus_bus *bus = conn->bus;
-
-               mutex_lock(&bus->lock);
-               target_conn = kdbus_bus_find_conn_by_id(bus, cmd->owner_id);
-               mutex_unlock(&bus->lock);
-
+               target_conn = kdbus_conn_find_peer(conn, cmd->owner_id);
                if (!target_conn)
                        return -ENXIO;
 

diff --git a/names.c b/names.c
index a7761d10940ee1023deb1bde253a70832a9220c6..f4f56d898dd54e3b08def62c424b448108922813 100644 (file)
--- a/names.c
+++ b/names.c
@@ -605,10 +605,7 @@ int kdbus_cmd_name_acquire(struct kdbus_name_registry *reg,
                if (!kdbus_bus_uid_is_privileged(bus))
                        return -EPERM;
 
-               mutex_lock(&bus->lock);
-               new_conn = kdbus_bus_find_conn_by_id(bus, cmd->owner_id);
-               mutex_unlock(&bus->lock);
-
+               new_conn = kdbus_conn_find_peer(conn, cmd->owner_id);
                if (!new_conn)
                        return -ENXIO;