From owner-svn-src-head@FreeBSD.ORG  Wed Jul 17 10:56:22 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 623B63F9;
 Wed, 17 Jul 2013 10:56:22 +0000 (UTC) (envelope-from kib@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 5538491B;
 Wed, 17 Jul 2013 10:56:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HAuMvG047312;
 Wed, 17 Jul 2013 10:56:22 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HAuM5g047311;
 Wed, 17 Jul 2013 10:56:22 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201307171056.r6HAuM5g047311@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 17 Jul 2013 10:56:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253417 - 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: Wed, 17 Jul 2013 10:56:22 -0000

Author: kib
Date: Wed Jul 17 10:56:21 2013
New Revision: 253417
URL: http://svnweb.freebsd.org/changeset/base/253417

Log:
  Clear the vnode knotes before destroying vpollinfo.
  
  Reported and tested by:	Patrick Lamaiziere <patfbsd@davenulle.org>
  Sponsored by:	The FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/kern/vfs_subr.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Wed Jul 17 10:53:11 2013	(r253416)
+++ head/sys/kern/vfs_subr.c	Wed Jul 17 10:56:21 2013	(r253417)
@@ -3455,6 +3455,8 @@ vfs_msync(struct mount *mp, int flags)
 static void
 destroy_vpollinfo(struct vpollinfo *vi)
 {
+
+	knlist_clear(&vi->vpi_selinfo.si_note, 1);
 	seldrain(&vi->vpi_selinfo);
 	knlist_destroy(&vi->vpi_selinfo.si_note);
 	mtx_destroy(&vi->vpi_lock);