Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar: "A liblockdep fix and a mutex_unlock() mutex-debugging fix" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: mutex: Always clear owner field upon mutex_unlock() tools/liblockdep: Fix debug_check thinko in mutex destroy

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar: "A liblockdep fix and a mutex_unlock() mutex-debugging fix" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: mutex: Always clear owner field upon mutex_unlock() tools/liblockdep: Fix debug_check thinko in mutex destroy
Linus Torvalds
2 parents b800c91a05 8e654dd68f
Showing 2 changed files Side-by-side Diff
kernel/locking/mutex-debug.c
tools/lib/lockdep/preload.c
@@ -80,13 +80,13 @@
 			DEBUG_LOCKS_WARN_ON(lock->owner != current);
  
 		DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
-		mutex_clear_owner(lock);
 	}
  
 	/*
 	 * __mutex_slowpath_needs_to_unlock() is explicitly 0 for debug
 	 * mutexes so that we can do it here after we've verified state.
 	 */
+	mutex_clear_owner(lock);
 	atomic_set(&lock->count, 1);
 }
  
@@ -317,7 +317,7 @@
 	 *
 	 * TODO: Hook into free() and add that check there as well.
 	 */
-	debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex));
+	debug_check_no_locks_freed(mutex, sizeof(*mutex));
 	__del_lock(__get_lock(mutex));
 	return ll_pthread_mutex_destroy(mutex);
 }
@@ -341,7 +341,7 @@
 {
 	try_init_preload();
  
-	debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock));
+	debug_check_no_locks_freed(rwlock, sizeof(*rwlock));
 	__del_lock(__get_lock(rwlock));
 	return ll_pthread_rwlock_destroy(rwlock);
 }
...	...	@@ -80,13 +80,13 @@
80	80	DEBUG_LOCKS_WARN_ON(lock->owner != current);
81	81
82	82	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
83		- mutex_clear_owner(lock);
84	83	}
85	84
86	85	/*
87	86	* __mutex_slowpath_needs_to_unlock() is explicitly 0 for debug
88	87	* mutexes so that we can do it here after we've verified state.
89	88	*/
	89	+ mutex_clear_owner(lock);
90	90	atomic_set(&lock->count, 1);
91	91	}
92	92
...	...	@@ -317,7 +317,7 @@
317	317	*
318	318	* TODO: Hook into free() and add that check there as well.
319	319	*/
320		- debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex));
	320	+ debug_check_no_locks_freed(mutex, sizeof(*mutex));
321	321	__del_lock(__get_lock(mutex));
322	322	return ll_pthread_mutex_destroy(mutex);
323	323	}
...	...	@@ -341,7 +341,7 @@
341	341	{
342	342	try_init_preload();
343	343
344		- debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock));
	344	+ debug_check_no_locks_freed(rwlock, sizeof(*rwlock));
345	345	__del_lock(__get_lock(rwlock));
346	346	return ll_pthread_rwlock_destroy(rwlock);
347	347	}