Commit 37c778d6 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Zheng Zengkai
Browse files

locking/mutex: Fix non debug version of mutex_lock_io_nested() 



stable inclusion
from stable-5.10.27
commit c6c9bc4f261d9c83d3ad81968ec0f8b6a2cc0ff4
bugzilla: 51493

--------------------------------

commit 291da9d4 upstream.

If CONFIG_DEBUG_LOCK_ALLOC=n then mutex_lock_io_nested() maps to
mutex_lock() which is clearly wrong because mutex_lock() lacks the
io_schedule_prepare()/finish() invocations.

Map it to mutex_lock_io().

Fixes: f21860ba ("locking/mutex, sched/wait: Fix the mutex_lock_io_nested() define")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/878s6fshii.fsf@nanos.tec.linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e36ea364

include/linux/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ extern void mutex_lock_io(struct mutex *lock); 
# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)

# define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock)

# define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)

# define mutex_lock_io_nested(lock, subclass) mutex_lock(lock)

# define mutex_lock_io_nested(lock, subclass) mutex_lock_io(lock)

#endif



/*