| Date | Fri, 30 Jul 2021 15:50:45 +0200 | From | Thomas Gleixner <> | Subject | [patch 38/63] locking/ww_mutex: Split up ww_mutex_unlock() |
| |
From: Peter Zijlstra <peterz@infradead.org>
Split the ww related part out into a helper function so it can be reused for a rtmutex based ww_mutex implementation.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- kernel/locking/mutex.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) --- --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -750,19 +750,7 @@ EXPORT_SYMBOL(mutex_unlock); */ void __sched ww_mutex_unlock(struct ww_mutex *lock) { - /* - * The unlocking fastpath is the 0->1 transition from 'locked' - * into 'unlocked' state: - */ - if (lock->ctx) { -#ifdef CONFIG_DEBUG_MUTEXES - DEBUG_LOCKS_WARN_ON(!lock->ctx->acquired); -#endif - if (lock->ctx->acquired > 0) - lock->ctx->acquired--; - lock->ctx = NULL; - } - + __ww_mutex_unlock(lock); mutex_unlock(&lock->base); } EXPORT_SYMBOL(ww_mutex_unlock); @@ -915,6 +903,18 @@ static inline int __sched return 0; } +static void __ww_mutex_unlock(struct ww_mutex *lock) +{ + if (lock->ctx) { +#ifdef CONFIG_DEBUG_MUTEXES + DEBUG_LOCKS_WARN_ON(!lock->ctx->acquired); +#endif + if (lock->ctx->acquired > 0) + lock->ctx->acquired--; + lock->ctx = NULL; + } +} + /* * Lock a mutex (possibly interruptible), slowpath: */
|