From owner-svn-src-user@FreeBSD.ORG Sun Nov 1 01:42:45 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D28F106566C; Sun, 1 Nov 2009 01:42:45 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 32D098FC0C; Sun, 1 Nov 2009 01:42:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA11gjfI009438; Sun, 1 Nov 2009 01:42:45 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA11gjhf009436; Sun, 1 Nov 2009 01:42:45 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911010142.nA11gjhf009436@svn.freebsd.org> From: Kip Macy Date: Sun, 1 Nov 2009 01:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198735 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2009 01:42:45 -0000 Author: kmacy Date: Sun Nov 1 01:42:44 2009 New Revision: 198735 URL: http://svn.freebsd.org/changeset/base/198735 Log: - free ZFS resources on shutdown - fix eventhandler call - use private KTR flag Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct 31 22:50:29 2009 (r198734) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Nov 1 01:42:44 2009 (r198735) @@ -1347,7 +1347,7 @@ arc_getblk(arc_buf_t *buf) } else newbp = getblk(spa_get_vnode(spa), blkno, size, 0, 0, flags); - CTR2(KTR_BUF, "arc_getblk() bp=%p flags %X", + CTR2(KTR_SPARE2, "arc_getblk() bp=%p flags %X", newbp, newbp->b_flags); BUF_KERNPROC(newbp); @@ -1363,6 +1363,8 @@ arc_brelse(arc_buf_t *buf, void *data, s if (buf->b_bp->b_vp) KASSERT(buf->b_bp->b_xflags & BX_VNCLEAN, ("brelse() on buffer that is not in splay")); #endif + CTR3(KTR_SPARE2, "arc_brelse() bp=%p flags %X size %ld", + buf->b_bp, buf->b_bp->b_flags, size); brelse(buf->b_bp); } @@ -3325,7 +3327,7 @@ arc_write_done(zio_t *zio) struct vnode *vp = spa_get_vnode(hdr->b_spa); off_t blkno = hdr->b_dva.dva_word[1] & ~(1UL<<63); - CTR2(KTR_BUF, "arc_write_done(%p) flags %X", + CTR2(KTR_SPARE2, "arc_write_done(%p) flags %X", bp, bp->b_flags); if ((hdr->b_buf == buf) && @@ -3677,7 +3679,6 @@ arc_shutdown(void *arg __unused, int how struct mount *mp, *tmpmp; int error; - arc_flush(NULL); TAILQ_FOREACH_SAFE(mp, &mountlist, mnt_list, tmpmp) { if (strcmp(mp->mnt_vfc->vfc_name, "zfs") == 0) { error = dounmount(mp, MNT_FORCE, curthread); @@ -3693,6 +3694,14 @@ arc_shutdown(void *arg __unused, int how } } + arc_flush(NULL); + +#if 0 + zfsdev_fini(); + zvol_fini(); + zfs_fini(); +#endif + spa_fini(); } #endif @@ -3821,7 +3830,7 @@ arc_init(void) arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, EVENTHANDLER_PRI_FIRST); arc_event_shutdown = EVENTHANDLER_REGISTER(shutdown_pre_sync, - arc_event_shutdown, NULL, EVENTHANDLER_PRI_FIRST); + arc_shutdown, NULL, EVENTHANDLER_PRI_FIRST); #endif arc_dead = FALSE;