From: Christoph Hellwig Date: Wed, 28 Aug 2019 14:19:55 +0000 (+0200) Subject: pagewalk: use lockdep_assert_held for locking validation X-Git-Tag: microblaze-v5.5-rc1~121^2~5 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=b4bc7817b2bcc2432db6de99188c85ef16314c93;p=linux-2.6-microblaze.git pagewalk: use lockdep_assert_held for locking validation Use lockdep to check for held locks instead of using home grown asserts. Link: https://lore.kernel.org/r/20190828141955.22210-4-hch@lst.de Signed-off-by: Christoph Hellwig Reviewed-by: Thomas Hellstrom Reviewed-by: Steven Price Reviewed-by: Jason Gunthorpe Signed-off-by: Jason Gunthorpe --- diff --git a/mm/pagewalk.c b/mm/pagewalk.c index b8762b673a3d..d48c2a986ea3 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -317,7 +317,7 @@ int walk_page_range(struct mm_struct *mm, unsigned long start, if (!walk.mm) return -EINVAL; - VM_BUG_ON_MM(!rwsem_is_locked(&walk.mm->mmap_sem), walk.mm); + lockdep_assert_held(&walk.mm->mmap_sem); vma = find_vma(walk.mm, start); do { @@ -367,7 +367,7 @@ int walk_page_vma(struct vm_area_struct *vma, const struct mm_walk_ops *ops, if (!walk.mm) return -EINVAL; - VM_BUG_ON(!rwsem_is_locked(&vma->vm_mm->mmap_sem)); + lockdep_assert_held(&walk.mm->mmap_sem); err = walk_page_test(vma->vm_start, vma->vm_end, &walk); if (err > 0)