| From: Suren Baghdasaryan <surenb@google.com> |
| Subject: mm: move mmap_lock assert function definitions |
| Date: Mon, 27 Feb 2023 09:36:10 -0800 |
| |
| Move mmap_lock assert function definitions up so that they can be used by |
| other mmap_lock routines. |
| |
| Link: https://lkml.kernel.org/r/20230227173632.3292573-12-surenb@google.com |
| Signed-off-by: Suren Baghdasaryan <surenb@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| include/linux/mmap_lock.h | 24 ++++++++++++------------ |
| 1 file changed, 12 insertions(+), 12 deletions(-) |
| |
| --- a/include/linux/mmap_lock.h~mm-move-mmap_lock-assert-function-definitions |
| +++ a/include/linux/mmap_lock.h |
| @@ -60,6 +60,18 @@ static inline void __mmap_lock_trace_rel |
| |
| #endif /* CONFIG_TRACING */ |
| |
| +static inline void mmap_assert_locked(struct mm_struct *mm) |
| +{ |
| + lockdep_assert_held(&mm->mmap_lock); |
| + VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); |
| +} |
| + |
| +static inline void mmap_assert_write_locked(struct mm_struct *mm) |
| +{ |
| + lockdep_assert_held_write(&mm->mmap_lock); |
| + VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); |
| +} |
| + |
| static inline void mmap_init_lock(struct mm_struct *mm) |
| { |
| init_rwsem(&mm->mmap_lock); |
| @@ -150,18 +162,6 @@ static inline void mmap_read_unlock_non_ |
| up_read_non_owner(&mm->mmap_lock); |
| } |
| |
| -static inline void mmap_assert_locked(struct mm_struct *mm) |
| -{ |
| - lockdep_assert_held(&mm->mmap_lock); |
| - VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); |
| -} |
| - |
| -static inline void mmap_assert_write_locked(struct mm_struct *mm) |
| -{ |
| - lockdep_assert_held_write(&mm->mmap_lock); |
| - VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_lock), mm); |
| -} |
| - |
| static inline int mmap_lock_is_contended(struct mm_struct *mm) |
| { |
| return rwsem_is_contended(&mm->mmap_lock); |
| _ |