diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2021-03-22 09:46:13 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-30 14:37:02 +0200 |
commit | fb5318f0c0370a4ee0d62effb36014ed452b72c7 (patch) | |
tree | 217fc819633c22e6eb2a55008504596bfc0c5b57 | |
parent | 1e8efaf7e5c46657ebe8596c7ec234a1cb00c65e (diff) |
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: f21860bac05b ("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>
-rw-r--r-- | include/linux/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 3093dd162424..8f7cdf83f359 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -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 /* |