diff options
| author | Lance Roy <ldr709@gmail.com> | 2018-10-02 22:38:57 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-10-09 13:19:28 +0200 |
| commit | 4de1a293a08bdf8ec1530e02163930ac86f80ea2 (patch) | |
| tree | c1a9fff82f72eeb9c55c3f7d1ae57ff3c63a587a /kernel/futex.c | |
| parent | 8ca2b56cd7da98fc8f8d787bb706b9d6c8674a3b (diff) | |
| download | lwn-4de1a293a08bdf8ec1530e02163930ac86f80ea2.tar.gz lwn-4de1a293a08bdf8ec1530e02163930ac86f80ea2.zip | |
futex: Replace spin_is_locked() with lockdep
lockdep_assert_held() is better suited for checking locking requirements,
since it won't get confused when the lock is held by some other task. This
is also a step towards possibly removing spin_is_locked().
Signed-off-by: Lance Roy <ldr709@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "Paul E. McKenney" <paulmck@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Darren Hart <dvhart@infradead.org>
Link: https://lkml.kernel.org/r/20181003053902.6910-12-ldr709@gmail.com
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 11fc3bb456d6..3e2de8fc1891 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1365,9 +1365,9 @@ static void __unqueue_futex(struct futex_q *q) { struct futex_hash_bucket *hb; - if (WARN_ON_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr)) - || WARN_ON(plist_node_empty(&q->list))) + if (WARN_ON_SMP(!q->lock_ptr) || WARN_ON(plist_node_empty(&q->list))) return; + lockdep_assert_held(q->lock_ptr); hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock); plist_del(&q->list, &hb->chain); |