Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866d65b9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jonathan Corbet
Browse files

Documentation/locking/lockdep: Drop last two chars of sample states 



Since the removal of FS_RECLAIM annotations, lockdep states contain four
characters, not six.

Fixes: e5684bbf ("Documentation/locking/lockdep: Update info about states")
Fixes: d92a8cfc ("locking/lockdep: Rework FS_RECLAIM annotation")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 6cd43851

Documentation/RCU/lockdep-splat.txt

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ other info that might help us debug this: 


rcu_scheduler_active = 1, debug_locks = 0

3 locks held by scsi_scan_6/1552:

 #0:  (&shost->scan_mutex){+.+.+.}, at: [<ffffffff8145efca>]

 #0:  (&shost->scan_mutex){+.+.}, at: [<ffffffff8145efca>]

scsi_scan_host_selected+0x5a/0x150

 #1:  (&eq->sysfs_lock){+.+...}, at: [<ffffffff812a5032>]

 #1:  (&eq->sysfs_lock){+.+.}, at: [<ffffffff812a5032>]

elevator_exit+0x22/0x60

 #2:  (&(&q->__queue_lock)->rlock){-.-...}, at: [<ffffffff812b6233>]

 #2:  (&(&q->__queue_lock)->rlock){-.-.}, at: [<ffffffff812b6233>]

cfq_exit_queue+0x43/0x190



stack backtrace:

Documentation/locking/lockdep-design.txt

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ When locking rules are violated, these state bits are presented in the 
locking error messages, inside curlies. A contrived example:



   modprobe/2287 is trying to acquire lock:

    (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24

    (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24



   but task is already holding lock:

    (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24

    (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24





The bit position indicates STATE, STATE-read, for each of the states listed