From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Tue, 22 Oct 2013 09:24:09 +0000 (-0400)
Subject: dtrace: fix mutex_owned() implementation
X-Git-Tag: v4.1.12-92~313^2~52
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0f54b36ff4c5ba6b819c835c437617387cd91d66;p=users%2Fjedix%2Flinux-maple.git

dtrace: fix mutex_owned() implementation

The mutex_owned() function was not accounting for the possibility that a lock
might have an owner registered while unlocked.

Orabug: 17624236

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
---

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 479a770d4445..b3ef508a120e 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -182,7 +182,7 @@ extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
 #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
 static inline int mutex_owned(struct mutex *lock)
 {
-	return lock->owner == current;
+	return mutex_is_locked(lock) && lock->owner == current;
 }
 #else
 static inline int mutex_owned(struct mutex *lock)