Skip to contentSkip to conversation

locking/lockdep: update the comment for __lock_release()

PATCH Applied Dan Carpenter 3 participants 3 messages Nov 4, 2019 – Nov 13, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 locking/lockdep: update the comment for __lock_release()

This changes "to the list" to "from the list" and also deletes the obsolete comment about the "@nested" argument. The "nested" argument was removed in commit 5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()").

---
 kernel/locking/lockdep.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/locking/lockdep.c +1 -3
index 8123518f9045..32282e7112d3 100644
@@ -4208,11 +4208,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
 }
 
 /*
- * Remove the lock to the list of currently held locks - this gets
+ * Remove the lock from the list of currently held locks - this gets
  * called on mutex_unlock()/spin_unlock*() (or on a failed
  * mutex_lock_interruptible()).
- *
- * @nested is an hysterical artifact, needs a tree wide cleanup.
  */
 static int
 __lock_release(struct lockdep_map *lock, unsigned long ip)
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 6 lines · Dan Carpenter

This changes "to the list" to "from the list" and also deletes the obsolete comment about the "@nested" argument. The "nested" argument was removed in commit 5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()").

Thanks Dan!

merge bot Applied
#2 lore raw

[tip: locking/core] locking/lockdep: Update the comment for __lock_release()

In reply to Dan Carpenter
The following commit has been merged into the locking/core branch of tip:

The following commit has been merged into the locking/core branch of tip:

Commit-ID:     c759bc47db0fb8c02ecf2b2acc4b7fc6e4099039
Gitweb:        https://git.kernel.org/tip/c759bc47db0fb8c02ecf2b2acc4b7fc6e4099039
Author:        Dan Carpenter <[email protected]>
AuthorDate:    Mon, 04 Nov 2019 12:12:52 +03:00
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Wed, 13 Nov 2019 11:07:48 +01:00

locking/lockdep: Update the comment for __lock_release()

This changes "to the list" to "from the list" and also deletes the obsolete comment about the "@nested" argument.

The "nested" argument was removed in this commit, earlier this year:

5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()").

---
 kernel/locking/lockdep.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/locking/lockdep.c +1 -3
index 8123518..32282e7 100644
@@ -4208,11 +4208,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
 }
 
 /*
- * Remove the lock to the list of currently held locks - this gets
+ * Remove the lock from the list of currently held locks - this gets
  * called on mutex_unlock()/spin_unlock*() (or on a failed
  * mutex_lock_interruptible()).
- *
- * @nested is an hysterical artifact, needs a tree wide cleanup.
  */
 static int
 __lock_release(struct lockdep_map *lock, unsigned long ip)