1 files changed, 16 insertions, 3 deletions

diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 02254a48d27e..3b67bfa368cf 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -661,9 +661,22 @@ lockmgr_chain(struct thread *td, struct thread **ownerp)
 	lkp = td->td_wchan;
 
 	/* Simple test to see if wchan points to a lockmgr lock. */
-	if (lkp->lk_wmesg != td->td_wmesg)
-		return (0);
-
+	if (lkp->lk_wmesg == td->td_wmesg)
+		goto ok;
+
+	/*
+	 * If this thread is doing a DRAIN, then it would be asleep on
+	 * &lkp->lk_flags rather than lkp.
+	 */
+	lkp = (struct lock *)((char *)td->td_wchan -
+	    offsetof(struct lock, lk_flags));
+	if (lkp->lk_wmesg == td->td_wmesg && (lkp->lk_flags & LK_WAITDRAIN))
+		goto ok;
+
+	/* Doen't seem to be a lockmgr lock. */
+	return (0);
+
+ok:
 	/* Ok, we think we have a lockmgr lock, so output some details. */
 	db_printf("blocked on lk \"%s\" ", lkp->lk_wmesg);
 	if (lkp->lk_sharecount) {