svn commit: r245351 - stable/9/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Sun Jan 13 00:32:07 2013
New Revision: 245351
URL: http://svnweb.freebsd.org/changeset/base/245351

Log:
  MFC r245113:
  lockmgr: unlock interlock (if requested) when dealing with upgrade/downgrade
  requests for LK_NOSHARE locks, just like for shared locks.
  
  PR:		kern/174969

Modified:
  stable/9/sys/kern/kern_lock.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_lock.c
==============================================================================
--- stable/9/sys/kern/kern_lock.c	Sat Jan 12 23:49:11 2013	(r245350)
+++ stable/9/sys/kern/kern_lock.c	Sun Jan 13 00:32:07 2013	(r245351)
@@ -489,6 +489,8 @@ __lockmgr_args(struct lock *lk, u_int fl
 		case LK_DOWNGRADE:
 			_lockmgr_assert(lk, KA_XLOCKED | KA_NOTRECURSED,
 			    file, line);
+			if (flags & LK_INTERLOCK)
+				class->lc_unlock(ilk);
 			return (0);
 		}
 	}