From owner-svn-src-head@FreeBSD.ORG  Sun Jan  6 21:48:00 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7EC66669;
 Sun,  6 Jan 2013 21:48:00 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 55D8B196B;
 Sun,  6 Jan 2013 21:48:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06Lm0xv065287;
 Sun, 6 Jan 2013 21:48:00 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06Lm0EI065286;
 Sun, 6 Jan 2013 21:48:00 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201301062148.r06Lm0EI065286@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sun, 6 Jan 2013 21:48:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245113 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jan 2013 21:48:00 -0000

Author: mjg
Date: Sun Jan  6 21:47:59 2013
New Revision: 245113
URL: http://svnweb.freebsd.org/changeset/base/245113

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

Modified:
  head/sys/kern/kern_lock.c

Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c	Sun Jan  6 20:50:31 2013	(r245112)
+++ head/sys/kern/kern_lock.c	Sun Jan  6 21:47:59 2013	(r245113)
@@ -498,6 +498,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);
 		}
 	}