Message ID | 20250113161112.452505-4-mic@digikod.net (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | Use scoped guards on Landlock | expand |
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 2bf91b57591b..dfd128a3f365 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -199,6 +199,8 @@ extern void mutex_unlock(struct mutex *lock); extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); DEFINE_GUARD(mutex, struct mutex *, mutex_lock(_T), mutex_unlock(_T)) +DEFINE_GUARD(mutex_nest_1, struct mutex *, + mutex_lock_nested(_T, SINGLE_DEPTH_NESTING), mutex_unlock(_T)) DEFINE_GUARD_COND(mutex, _try, mutex_trylock(_T)) DEFINE_GUARD_COND(mutex, _intr, mutex_lock_interruptible(_T) == 0)
Several places use a mutex with SINGLE_DEPTH_NESTING, but there is no proper way to use a scoped guard with that. Add a mutex_nest_1() scoped guard that call metex_lock() with SINGLE_DEPTH_NESTING (defined in lockdep.h). This will initially by used by Landlock in a following commit. Cc: Boqun Feng <boqun.feng@gmail.com> Cc: Günther Noack <gnoack@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Waiman Long <longman@redhat.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Mickaël Salaün <mic@digikod.net> Link: https://lore.kernel.org/r/20250113161112.452505-4-mic@digikod.net --- include/linux/mutex.h | 2 ++ 1 file changed, 2 insertions(+)