From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from terminus.zytor.com ([198.137.202.136]:43603 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbeLDWfC (ORCPT ); Tue, 4 Dec 2018 17:35:02 -0500 Date: Tue, 4 Dec 2018 14:34:54 -0800 From: tip-bot for Lance Roy Message-ID: Cc: paulmck@linux.ibm.com, linux-fsdevel@vger.kernel.org, ldr709@gmail.com, hpa@zytor.com, mingo@kernel.org, viro@zeniv.linux.org.uk, tglx@linutronix.de Reply-To: tglx@linutronix.de, hpa@zytor.com, paulmck@linux.ibm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, ldr709@gmail.com, linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk To: linux-tip-commits@vger.kernel.org Subject: [tip:core/rcu] userfaultfd: Replace spin_is_locked() with lockdep MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Commit-ID: 456a737896b25e4853bbf3d6ca5a1c8ee4df4ee9 Gitweb: https://git.kernel.org/tip/456a737896b25e4853bbf3d6ca5a1c8ee4df4ee9 Author: Lance Roy AuthorDate: Thu, 4 Oct 2018 23:45:44 -0700 Committer: Paul E. McKenney CommitDate: Mon, 12 Nov 2018 09:06:22 -0800 userfaultfd: Replace spin_is_locked() with lockdep lockdep_assert_held() is better suited to checking locking requirements, since it only checks if the current thread holds the lock regardless of whether someone else does. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy Cc: Alexander Viro Cc: Signed-off-by: Paul E. McKenney --- fs/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 356d2b8568c1..681881dc8a9d 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -926,7 +926,7 @@ static inline struct userfaultfd_wait_queue *find_userfault_in( wait_queue_entry_t *wq; struct userfaultfd_wait_queue *uwq; - VM_BUG_ON(!spin_is_locked(&wqh->lock)); + lockdep_assert_held(&wqh->lock); uwq = NULL; if (!waitqueue_active(wqh))