Commit fb5318f0 authored Mar 22, 2021 by Thomas Gleixner Committed by Greg Kroah-Hartman Mar 30, 2021

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



commit 291da9d4a9eb3a1cb0610b7f4480f5b52b1825e7 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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/878s6fshii.fsf@nanos.tec.linutronix.de


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1e8efaf7

include/linux/mutex.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,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

		/*