locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling
authorWaiman Long <longman@redhat.com>
Tue, 16 Mar 2021 15:31:16 +0000 (11:31 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 7 Apr 2021 13:00:06 +0000 (15:00 +0200)
commit905ef030bdf9710ae7581ecf13be07cae59c815f
tree917116e7865fabcceddd233fd1c1c854f58264a9
parent1e2a75c24a487a1fc713c4b78749c2b8a3a8d387
locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling

[ Upstream commit 5de2055d31ea88fd9ae9709ac95c372a505a60fa ]

The use_ww_ctx flag is passed to mutex_optimistic_spin(), but the
function doesn't use it. The frequent use of the (use_ww_ctx && ww_ctx)
combination is repetitive.

In fact, ww_ctx should not be used at all if !use_ww_ctx.  Simplify
ww_mutex code by dropping use_ww_ctx from mutex_optimistic_spin() an
clear ww_ctx if !use_ww_ctx. In this way, we can replace (use_ww_ctx &&
ww_ctx) by just (ww_ctx).

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Davidlohr Bueso <dbueso@suse.de>
Link: https://lore.kernel.org/r/20210316153119.13802-2-longman@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/locking/mutex.c