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 479a770d44450d09013a01babbd655c74a5e41f8..b3ef508a120eba953682c8d3ce3fcda9b9796aff 100644 (file)
--- 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)