mutex_lock() sets the lock owner, no need to set it upfront in __mutex_lock_common(). Inside __mutex_lock_common() we can cope with the case where the successful acquirer got preempted by us before setting the owner field: there is an explicit check in the spinning code and the sleeping part doesn't rely on it. The debug code does owner checks only on unlock where the field is garuanteed to be set. Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> --- kernel/mutex.c | 2 -- 1 file changed, 2 deletions(-) Just a small observation. Peter said it wouldn't matter much as the write is to a hot cache line. But otoh, why keep it if it's not necessary. :) --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -195,7 +195,6 @@ __mutex_lock_common(struct mutex *lock, if (atomic_cmpxchg(&lock->count, 1, 0) == 1) { lock_acquired(&lock->dep_map, ip); - mutex_set_owner(lock); preempt_enable(); return 0; } @@ -263,7 +262,6 @@ done: lock_acquired(&lock->dep_map, ip); /* got the lock - rejoice! */ mutex_remove_waiter(lock, &waiter, current_thread_info()); - mutex_set_owner(lock); /* set it to 0 if there are no waiters left: */ if (likely(list_empty(&lock->wait_list))) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html