From 2e4d020a8d4e1ca101af87eacd65617a95fabfad Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Wed, 7 Jan 2015 18:41:32 +0100 Subject: [PATCH] connection: unlock order doesn't matter Make kdbus_conn_unlock2() just unlock both mutices, unlock order never matters. Signed-off-by: David Herrmann --- connection.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/connection.h b/connection.h index ad438eb..62b1b06 100644 --- a/connection.h +++ b/connection.h @@ -221,8 +221,6 @@ static inline void kdbus_conn_lock2(struct kdbus_conn *a, struct kdbus_conn *b) if (a < b) { mutex_lock(&a->lock); mutex_lock_nested(&b->lock, 1); - } else if (a == b) { - mutex_lock(&a->lock); } else { mutex_lock(&b->lock); mutex_lock_nested(&a->lock, 1); @@ -239,15 +237,8 @@ static inline void kdbus_conn_lock2(struct kdbus_conn *a, struct kdbus_conn *b) static inline void kdbus_conn_unlock2(struct kdbus_conn *a, struct kdbus_conn *b) { - if (a < b) { - mutex_unlock(&b->lock); - mutex_unlock(&a->lock); - } else if (a == b) { - mutex_unlock(&a->lock); - } else { - mutex_unlock(&a->lock); - mutex_unlock(&b->lock); - } + mutex_unlock(&a->lock); + mutex_unlock(&b->lock); } #endif -- 2.34.1