From owner-svn-src-stable@freebsd.org  Sat Mar  4 18:12:00 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A191CF9FCD;
 Sat,  4 Mar 2017 18:12:00 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 23A0912D8;
 Sat,  4 Mar 2017 18:12:00 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v24IBx75001181;
 Sat, 4 Mar 2017 18:11:59 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v24IBxwd001179;
 Sat, 4 Mar 2017 18:11:59 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201703041811.v24IBxwd001179@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 4 Mar 2017 18:11:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r314674 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Mar 2017 18:12:00 -0000

Author: bdrewery
Date: Sat Mar  4 18:11:59 2017
New Revision: 314674
URL: https://svnweb.freebsd.org/changeset/base/314674

Log:
  MFC r313909:
  
    Fix panic with unlocked vnode to vrecycle().

Modified:
  stable/10/sys/kern/uipc_mqueue.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/uipc_mqueue.c
==============================================================================
--- stable/10/sys/kern/uipc_mqueue.c	Sat Mar  4 18:07:30 2017	(r314673)
+++ stable/10/sys/kern/uipc_mqueue.c	Sat Mar  4 18:11:59 2017	(r314674)
@@ -703,7 +703,9 @@ do_recycle(void *context, int pending __
 {
 	struct vnode *vp = (struct vnode *)context;
 
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	vrecycle(vp);
+	VOP_UNLOCK(vp, 0);
 	vdrop(vp);
 }