From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 06:23:29 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 311D6103; Wed, 7 Aug 2013 06:23:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1DFCF29D4; Wed, 7 Aug 2013 06:23:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r776NSRC055912; Wed, 7 Aug 2013 06:23:28 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r776NSor055911; Wed, 7 Aug 2013 06:23:28 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201308070623.r776NSor055911@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 7 Aug 2013 06:23:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254026 - stable/8/sys/kern X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 06:23:29 -0000 Author: kib Date: Wed Aug 7 06:23:28 2013 New Revision: 254026 URL: http://svnweb.freebsd.org/changeset/base/254026 Log: MFC r253417: Clear the vnode knotes before destroying vpollinfo. MFC r253737: Split the destruction into the helper destroy_vpollinfo_free(), and call it when raced, instead of destroy_vpollinfo(). Modified: stable/8/sys/kern/vfs_subr.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) Modified: stable/8/sys/kern/vfs_subr.c ============================================================================== --- stable/8/sys/kern/vfs_subr.c Wed Aug 7 06:21:20 2013 (r254025) +++ stable/8/sys/kern/vfs_subr.c Wed Aug 7 06:23:28 2013 (r254026) @@ -3432,14 +3432,23 @@ vbusy(struct vnode *vp) } static void -destroy_vpollinfo(struct vpollinfo *vi) +destroy_vpollinfo_free(struct vpollinfo *vi) { - seldrain(&vi->vpi_selinfo); + knlist_destroy(&vi->vpi_selinfo.si_note); mtx_destroy(&vi->vpi_lock); uma_zfree(vnodepoll_zone, vi); } +static void +destroy_vpollinfo(struct vpollinfo *vi) +{ + + knlist_clear(&vi->vpi_selinfo.si_note, 1); + seldrain(&vi->vpi_selinfo); + destroy_vpollinfo_free(vi); +} + /* * Initalize per-vnode helper structure to hold poll-related state. */ @@ -3457,7 +3466,7 @@ v_addpollinfo(struct vnode *vp) VI_LOCK(vp); if (vp->v_pollinfo != NULL) { VI_UNLOCK(vp); - destroy_vpollinfo(vi); + destroy_vpollinfo_free(vi); return; } vp->v_pollinfo = vi; From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 06:32:13 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E5E663B7; Wed, 7 Aug 2013 06:32:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D338F2A26; Wed, 7 Aug 2013 06:32:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r776WDoP060401; Wed, 7 Aug 2013 06:32:13 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r776WDng060400; Wed, 7 Aug 2013 06:32:13 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201308070632.r776WDng060400@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 7 Aug 2013 06:32:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254027 - stable/8/sys/i386/i386 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 06:32:14 -0000 Author: kib Date: Wed Aug 7 06:32:13 2013 New Revision: 254027 URL: http://svnweb.freebsd.org/changeset/base/254027 Log: MFC r253328: Create a proper stack frame for i386 version of bcopy(). Modified: stable/8/sys/i386/i386/support.s Directory Properties: stable/8/sys/ (props changed) stable/8/sys/i386/ (props changed) Modified: stable/8/sys/i386/i386/support.s ============================================================================== --- stable/8/sys/i386/i386/support.s Wed Aug 7 06:23:28 2013 (r254026) +++ stable/8/sys/i386/i386/support.s Wed Aug 7 06:32:13 2013 (r254027) @@ -193,11 +193,13 @@ END(bcopyb) * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 */ ENTRY(bcopy) + pushl %ebp + movl %esp,%ebp pushl %esi pushl %edi - movl 12(%esp),%esi - movl 16(%esp),%edi - movl 20(%esp),%ecx + movl 8(%ebp),%esi + movl 12(%ebp),%edi + movl 16(%ebp),%ecx movl %edi,%eax subl %esi,%eax @@ -208,12 +210,13 @@ ENTRY(bcopy) cld /* nope, copy forwards */ rep movsl - movl 20(%esp),%ecx + movl 16(%ebp),%ecx andl $3,%ecx /* any bytes left? */ rep movsb popl %edi popl %esi + popl %ebp ret ALIGN_TEXT @@ -226,7 +229,7 @@ ENTRY(bcopy) std rep movsb - movl 20(%esp),%ecx /* copy remainder by 32-bit words */ + movl 16(%ebp),%ecx /* copy remainder by 32-bit words */ shrl $2,%ecx subl $3,%esi subl $3,%edi @@ -235,6 +238,7 @@ ENTRY(bcopy) popl %edi popl %esi cld + popl %ebp ret END(bcopy) From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:28:01 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 63D629D8; Wed, 7 Aug 2013 07:28:01 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 519492CD9; Wed, 7 Aug 2013 07:28:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777S1q9081035; Wed, 7 Aug 2013 07:28:01 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777S1Oj081033; Wed, 7 Aug 2013 07:28:01 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070728.r777S1Oj081033@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:28:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254034 - stable/8/etc/rc.d X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:28:01 -0000 Author: avg Date: Wed Aug 7 07:28:00 2013 New Revision: 254034 URL: http://svnweb.freebsd.org/changeset/base/254034 Log: MFC r253076: rc.d/zfs: pass -v option to zfs mount Modified: stable/8/etc/rc.d/zfs Directory Properties: stable/8/etc/ (props changed) stable/8/etc/rc.d/ (props changed) Modified: stable/8/etc/rc.d/zfs ============================================================================== --- stable/8/etc/rc.d/zfs Wed Aug 7 07:27:49 2013 (r254033) +++ stable/8/etc/rc.d/zfs Wed Aug 7 07:28:00 2013 (r254034) @@ -23,7 +23,7 @@ zfs_start_jail() zfs_start_main() { - zfs mount -a + zfs mount -va zfs share -a if [ ! -r /etc/zfs/exports ]; then touch /etc/zfs/exports From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:31:41 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9470FC6D; Wed, 7 Aug 2013 07:31:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81B412D1E; Wed, 7 Aug 2013 07:31:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777VfX1083751; Wed, 7 Aug 2013 07:31:41 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777VfKN083750; Wed, 7 Aug 2013 07:31:41 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070731.r777VfKN083750@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:31:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254036 - stable/8/tools/tools/zfsboottest X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:31:41 -0000 Author: avg Date: Wed Aug 7 07:31:41 2013 New Revision: 254036 URL: http://svnweb.freebsd.org/changeset/base/254036 Log: MFC r253067: zfsboottest: sync with changes in zfs boot code Modified: stable/8/tools/tools/zfsboottest/zfsboottest.c Directory Properties: stable/8/tools/tools/zfsboottest/ (props changed) Modified: stable/8/tools/tools/zfsboottest/zfsboottest.c ============================================================================== --- stable/8/tools/tools/zfsboottest/zfsboottest.c Wed Aug 7 07:31:21 2013 (r254035) +++ stable/8/tools/tools/zfsboottest/zfsboottest.c Wed Aug 7 07:31:41 2013 (r254036) @@ -52,6 +52,7 @@ pager_output(const char *line) #define ZFS_TEST #define printf(...) fprintf(stderr, __VA_ARGS__) +#include "libzfs.h" #include "zfsimpl.c" #undef printf @@ -134,7 +135,6 @@ main(int argc, char** argv) close(fd[i - 1]); } } - spa_all_status(); spa = STAILQ_FIRST(&zfs_pools); if (spa == NULL) { @@ -147,7 +147,10 @@ main(int argc, char** argv) exit(1); } + spa_all_status(); + #if 0 + uint64_t rootobj; if (zfs_get_root(spa, &rootobj)) { fprintf(stderr, "can't get root\n"); exit(1); @@ -158,8 +161,8 @@ main(int argc, char** argv) if (zfs_mount(spa, 0, &zfsmnt)) { fprintf(stderr, "can't mount\n"); exit(1); - } #endif + } printf("\n"); for (++i, failures = 0; i < argc; i++) { From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:33:20 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5B65EEF1; Wed, 7 Aug 2013 07:33:20 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EFD22D39; Wed, 7 Aug 2013 07:33:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777XKNm084136; Wed, 7 Aug 2013 07:33:20 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777XKLP084135; Wed, 7 Aug 2013 07:33:20 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070733.r777XKLP084135@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:33:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254038 - stable/8/tools/tools/zfsboottest X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:33:20 -0000 Author: avg Date: Wed Aug 7 07:33:19 2013 New Revision: 254038 URL: http://svnweb.freebsd.org/changeset/base/254038 Log: MFC r253068: zfsboottest.sh: remove checks for things that are not strictly required Modified: stable/8/tools/tools/zfsboottest/zfsboottest.sh Directory Properties: stable/8/tools/tools/zfsboottest/ (props changed) Modified: stable/8/tools/tools/zfsboottest/zfsboottest.sh ============================================================================== --- stable/8/tools/tools/zfsboottest/zfsboottest.sh Wed Aug 7 07:32:56 2013 (r254037) +++ stable/8/tools/tools/zfsboottest/zfsboottest.sh Wed Aug 7 07:33:19 2013 (r254038) @@ -54,11 +54,6 @@ bootfs=`zpool get bootfs "${pool}" | tai if [ "${bootfs}" = "-" ]; then bootfs="${pool}" fi -# Dataset's mountpoint property should be set to 'legacy'. -if [ "`zfs get -H -o value mountpoint ${bootfs}`" != "legacy" ]; then - echo "The \"mountpoint\" property of dataset \"${bootfs}\" should be set to \"legacy\"." >&2 - exit 1 -fi mountpoint=`df -t zfs "${bootfs}" 2>/dev/null | tail -1 | awk '{print $6}'` if [ -z "${mountpoint}" ]; then echo "The \"${bootfs}\" dataset is not mounted." >&2 @@ -68,19 +63,6 @@ if [ ! -d "${mountpoint}${startdir}" ]; echo "The \"${mountpoint}${startdir}\" directory doesn't exist." >&2 exit 1 fi -# To be able to mount root ZFS file system we need either /etc/fstab entry -# or vfs.root.mountfrom variable set in /boot/loader.conf. -egrep -q '^'"${bootfs}"'[[:space:]]+/[[:space:]]+zfs[[:space:]]+' "${mountpoint}/etc/fstab" 2>/dev/null -if [ $? -ne 0 ]; then - egrep -q 'vfs.root.mountfrom="?'"zfs:${bootfs}"'"?[[:space:]]*$' "${mountpoint}/boot/loader.conf" 2>/dev/null - if [ $? -ne 0 ]; then - echo "To be able to boot from \"${bootfs}\", you need to declare" >&2 - echo "\"${bootfs}\" as being root file system in ${mountpoint}/etc/fstab" >&2 - echo "or add \"vfs.root.mountfrom\" variable set to \"zfs:${bootfs}\" to" >&2 - echo "${mountpoint}/boot/loader.conf." >&2 - exit 1 - fi -fi vdevs="" for vdev in `zpool status "${pool}" | grep ONLINE | awk '{print $1}'`; do vdev="/dev/${vdev#/dev/}" From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:35:00 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 78BE11BE; Wed, 7 Aug 2013 07:35:00 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 672672D42; Wed, 7 Aug 2013 07:35:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777Z0uV084521; Wed, 7 Aug 2013 07:35:00 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777Z0P9084519; Wed, 7 Aug 2013 07:35:00 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070735.r777Z0P9084519@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:35:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254040 - stable/8/tools/tools/zfsboottest X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:35:00 -0000 Author: avg Date: Wed Aug 7 07:34:59 2013 New Revision: 254040 URL: http://svnweb.freebsd.org/changeset/base/254040 Log: MFC r253605: zfsboottest: remove explicit -Werror Modified: stable/8/tools/tools/zfsboottest/Makefile Directory Properties: stable/8/tools/tools/zfsboottest/ (props changed) Modified: stable/8/tools/tools/zfsboottest/Makefile ============================================================================== --- stable/8/tools/tools/zfsboottest/Makefile Wed Aug 7 07:34:51 2013 (r254039) +++ stable/8/tools/tools/zfsboottest/Makefile Wed Aug 7 07:34:59 2013 (r254040) @@ -15,8 +15,7 @@ CFLAGS= -O1 \ -I${.CURDIR}/../../../sys/cddl/boot/zfs \ -I. \ -fdiagnostics-show-option \ - -W -Wextra -Wno-sign-compare -Wno-unused-parameter \ - -Werror + -W -Wextra -Wno-sign-compare -Wno-unused-parameter LDFLAGS+=-lmd .if ${MACHINE_ARCH} == "amd64" From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:36:38 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7F8CF42B; Wed, 7 Aug 2013 07:36:38 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6D3ED2D51; Wed, 7 Aug 2013 07:36:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777acth084884; Wed, 7 Aug 2013 07:36:38 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777acQP084882; Wed, 7 Aug 2013 07:36:38 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070736.r777acQP084882@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:36:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254042 - stable/8/sys/conf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:36:38 -0000 Author: avg Date: Wed Aug 7 07:36:37 2013 New Revision: 254042 URL: http://svnweb.freebsd.org/changeset/base/254042 Log: MFC r253072: amd64: use -mno-omit-leaf-frame-pointer in addition to -fno-omit-frame-pointer Modified: stable/8/sys/conf/Makefile.amd64 stable/8/sys/conf/kmod.mk Directory Properties: stable/8/sys/ (props changed) stable/8/sys/conf/ (props changed) Modified: stable/8/sys/conf/Makefile.amd64 ============================================================================== --- stable/8/sys/conf/Makefile.amd64 Wed Aug 7 07:36:28 2013 (r254041) +++ stable/8/sys/conf/Makefile.amd64 Wed Aug 7 07:36:37 2013 (r254042) @@ -35,7 +35,7 @@ DDB_ENABLED!= grep DDB opt_ddb.h || true DTR_ENABLED!= grep KDTRACE_FRAME opt_kdtrace.h || true HWPMC_ENABLED!= grep HWPMC opt_hwpmc_hooks.h || true .if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED) -CFLAGS+= -fno-omit-frame-pointer +CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer .endif MKMODULESENV+= MACHINE=amd64 Modified: stable/8/sys/conf/kmod.mk ============================================================================== --- stable/8/sys/conf/kmod.mk Wed Aug 7 07:36:28 2013 (r254041) +++ stable/8/sys/conf/kmod.mk Wed Aug 7 07:36:37 2013 (r254042) @@ -121,7 +121,7 @@ LDFLAGS+= -d -warn-common CFLAGS+= ${DEBUG_FLAGS} .if ${MACHINE_ARCH} == amd64 -CFLAGS+= -fno-omit-frame-pointer +CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer .endif .if ${MACHINE_ARCH} == "powerpc" From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:38:20 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2A8FF72B; Wed, 7 Aug 2013 07:38:19 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D0632D81; Wed, 7 Aug 2013 07:38:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777cJ9M085245; Wed, 7 Aug 2013 07:38:19 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777cJai085244; Wed, 7 Aug 2013 07:38:19 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070738.r777cJai085244@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:38:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254044 - stable/8/sys/conf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:38:20 -0000 Author: avg Date: Wed Aug 7 07:38:18 2013 New Revision: 254044 URL: http://svnweb.freebsd.org/changeset/base/254044 Log: MFC r253601: newvers.sh: fix the fallback case of git-svn detection Modified: stable/8/sys/conf/newvers.sh Directory Properties: stable/8/sys/ (props changed) stable/8/sys/conf/ (props changed) Modified: stable/8/sys/conf/newvers.sh ============================================================================== --- stable/8/sys/conf/newvers.sh Wed Aug 7 07:38:11 2013 (r254043) +++ stable/8/sys/conf/newvers.sh Wed Aug 7 07:38:18 2013 (r254044) @@ -121,7 +121,7 @@ if [ -n "$git_cmd" ] ; then else svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \ sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` - if [ -n $svn ] ; then + if [ -n "$svn" ] ; then svn=" r${svn}" git="+${git}" else From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:39:52 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D16D19D4; Wed, 7 Aug 2013 07:39:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B2DFA2D97; Wed, 7 Aug 2013 07:39:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777dqgA085569; Wed, 7 Aug 2013 07:39:52 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777dqul085568; Wed, 7 Aug 2013 07:39:52 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070739.r777dqul085568@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254046 - stable/8/sys/conf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:39:52 -0000 Author: avg Date: Wed Aug 7 07:39:52 2013 New Revision: 254046 URL: http://svnweb.freebsd.org/changeset/base/254046 Log: MFC r253602: newvers.sh: add another git-svn fallback Modified: stable/8/sys/conf/newvers.sh Directory Properties: stable/8/sys/ (props changed) stable/8/sys/conf/ (props changed) Modified: stable/8/sys/conf/newvers.sh ============================================================================== --- stable/8/sys/conf/newvers.sh Wed Aug 7 07:39:44 2013 (r254045) +++ stable/8/sys/conf/newvers.sh Wed Aug 7 07:39:52 2013 (r254046) @@ -121,6 +121,11 @@ if [ -n "$git_cmd" ] ; then else svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \ sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` + if [ -z "$svn" ] ; then + svn=`$git_cmd log --format='format:%N' | \ + grep '^svn ' | head -1 | \ + sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'` + fi if [ -n "$svn" ] ; then svn=" r${svn}" git="+${git}" From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:42:10 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2F258CD6; Wed, 7 Aug 2013 07:42:10 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BF9C2DDE; Wed, 7 Aug 2013 07:42:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777g9NN088001; Wed, 7 Aug 2013 07:42:09 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777g9lg088000; Wed, 7 Aug 2013 07:42:09 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070742.r777g9lg088000@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:42:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254048 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:42:10 -0000 Author: avg Date: Wed Aug 7 07:42:09 2013 New Revision: 254048 URL: http://svnweb.freebsd.org/changeset/base/254048 Log: MFC r253070: zfs: load zpool.cache after a root fs is mounted Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Wed Aug 7 07:41:48 2013 (r254047) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Wed Aug 7 07:42:09 2013 (r254048) @@ -1697,6 +1697,10 @@ spa_boot_init() spa_config_load(); } +#ifdef _KERNEL +EVENTHANDLER_DEFINE(mountroot, spa_boot_init, NULL, 0); +#endif + void spa_init(int mode) { From owner-svn-src-stable-8@FreeBSD.ORG Wed Aug 7 07:44:13 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B6FA0EE7; Wed, 7 Aug 2013 07:44:13 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A3CAD2DEF; Wed, 7 Aug 2013 07:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r777iD83088447; Wed, 7 Aug 2013 07:44:13 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r777iDtx088446; Wed, 7 Aug 2013 07:44:13 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308070744.r777iDtx088446@svn.freebsd.org> From: Andriy Gapon Date: Wed, 7 Aug 2013 07:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254050 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 07:44:13 -0000 Author: avg Date: Wed Aug 7 07:44:13 2013 New Revision: 254050 URL: http://svnweb.freebsd.org/changeset/base/254050 Log: MFC r253073: zfs: try to properly handle i/o errors in mappedread_sf Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Aug 7 07:44:03 2013 (r254049) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Aug 7 07:44:13 2013 (r254050) @@ -540,7 +540,9 @@ again: vm_page_io_finish(pp); vm_page_lock_queues(); if (error) { - vm_page_free(pp); + if (pp->wire_count == 0 && pp->valid == 0 && + pp->busy == 0 && !(pp->oflags & VPO_BUSY)) + vm_page_free(pp); } else { pp->valid = VM_PAGE_BITS_ALL; vm_page_activate(pp); From owner-svn-src-stable-8@FreeBSD.ORG Thu Aug 8 05:41:55 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EE233596; Thu, 8 Aug 2013 05:41:55 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DB66A26EA; Thu, 8 Aug 2013 05:41:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r785ftBq098372; Thu, 8 Aug 2013 05:41:55 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r785ft7D098371; Thu, 8 Aug 2013 05:41:55 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201308080541.r785ft7D098371@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 8 Aug 2013 05:41:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254084 - stable/8/sys/kern X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Aug 2013 05:41:56 -0000 Author: kib Date: Thu Aug 8 05:41:55 2013 New Revision: 254084 URL: http://svnweb.freebsd.org/changeset/base/254084 Log: MFC r253859: Remove unused malloc type. Modified: stable/8/sys/kern/kern_malloc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) Modified: stable/8/sys/kern/kern_malloc.c ============================================================================== --- stable/8/sys/kern/kern_malloc.c Thu Aug 8 05:35:58 2013 (r254083) +++ stable/8/sys/kern/kern_malloc.c Thu Aug 8 05:41:55 2013 (r254084) @@ -116,8 +116,6 @@ MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 static void kmeminit(void *); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL); -static MALLOC_DEFINE(M_FREE, "free", "should be on free list"); - static struct malloc_type *kmemstatistics; static vm_offset_t kmembase; static vm_offset_t kmemlimit; From owner-svn-src-stable-8@FreeBSD.ORG Thu Aug 8 17:20:10 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6EFB8787; Thu, 8 Aug 2013 17:20:10 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 431962629; Thu, 8 Aug 2013 17:20:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r78HKAHF065926; Thu, 8 Aug 2013 17:20:10 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r78HK9j4065920; Thu, 8 Aug 2013 17:20:09 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201308081720.r78HK9j4065920@svn.freebsd.org> From: Hiroki Sato Date: Thu, 8 Aug 2013 17:20:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254096 - in stable: 8/sys/dev/filemon 9/sys/dev/filemon X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Aug 2013 17:20:10 -0000 Author: hrs Date: Thu Aug 8 17:20:09 2013 New Revision: 254096 URL: http://svnweb.freebsd.org/changeset/base/254096 Log: MFC 253887,253977: - Use pget(PGET_CANDEBUG | PGET_NOTWEXIT) to determine if the specified PID is valid for monitoring in FILEMON_SET_PID ioctl. - Set the monitored PID to -1 when the process exits. Suggested by: jilles Tested by: sjg Modified: stable/8/sys/dev/filemon/filemon.c stable/8/sys/dev/filemon/filemon_wrapper.c Directory Properties: stable/8/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/dev/filemon/filemon.c stable/9/sys/dev/filemon/filemon_wrapper.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/8/sys/dev/filemon/filemon.c ============================================================================== --- stable/8/sys/dev/filemon/filemon.c Thu Aug 8 16:09:20 2013 (r254095) +++ stable/8/sys/dev/filemon/filemon.c Thu Aug 8 17:20:09 2013 (r254096) @@ -180,6 +180,7 @@ filemon_ioctl(struct cdev *dev, u_long c { int error = 0; struct filemon *filemon; + struct proc *p; #if __FreeBSD_version < 701000 filemon = dev->si_drv1; @@ -202,7 +203,12 @@ filemon_ioctl(struct cdev *dev, u_long c /* Set the monitored process ID. */ case FILEMON_SET_PID: - filemon->pid = *((pid_t *) data); + error = pget(*((pid_t *)data), PGET_CANDEBUG | PGET_NOTWEXIT, + &p); + if (error == 0) { + filemon->pid = p->p_pid; + PROC_UNLOCK(p); + } break; default: Modified: stable/8/sys/dev/filemon/filemon_wrapper.c ============================================================================== --- stable/8/sys/dev/filemon/filemon_wrapper.c Thu Aug 8 16:09:20 2013 (r254095) +++ stable/8/sys/dev/filemon/filemon_wrapper.c Thu Aug 8 17:20:09 2013 (r254096) @@ -574,6 +574,7 @@ filemon_wrapper_sys_exit(struct thread * (uintmax_t)now.tv_sec, (uintmax_t)now.tv_usec); filemon_output(filemon, filemon->msgbufr, len); + filemon->pid = -1; } /* Unlock the found filemon structure. */