From owner-svn-src-user@FreeBSD.ORG Sun Nov 1 04:43:36 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 2353A106566C; Sun, 1 Nov 2009 04:43:36 +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 126058FC19; Sun, 1 Nov 2009 04:43:36 +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 nA14hZut013398; Sun, 1 Nov 2009 04:43:35 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA14hZdO013396; Sun, 1 Nov 2009 04:43:35 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911010443.nA14hZdO013396@svn.freebsd.org> From: Kip Macy Date: Sun, 1 Nov 2009 04:43:35 +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: r198739 - 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 04:43:36 -0000 Author: kmacy Date: Sun Nov 1 04:43:35 2009 New Revision: 198739 URL: http://svn.freebsd.org/changeset/base/198739 Log: don't associate a buffer with the backing vnode unless it is not present in the ARC 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 Sun Nov 1 04:20:06 2009 (r198738) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Nov 1 04:43:35 2009 (r198739) @@ -3334,22 +3334,6 @@ arc_write_done(zio_t *zio) CTR2(KTR_SPARE2, "arc_write_done(%p) flags %X", bp, bp->b_flags); - if ((hdr->b_buf == buf) && - (bp->b_bufobj == NULL)) { - - bp->b_bufobj = &vp->v_bufobj; - bp->b_lblkno = blkno; - bp->b_blkno = blkno; - bp->b_offset = (blkno << 9); - BO_LOCK(bp->b_bufobj); - bgetvp(vp, bp); - BO_UNLOCK(bp->b_bufobj); - bp->b_flags &= ~B_INVAL; - bp->b_flags |= B_CACHE; - } - - /* - */ arc_cksum_verify(buf); exists = buf_hash_insert(hdr, &hash_lock); @@ -3371,7 +3355,20 @@ arc_write_done(zio_t *zio) arc_hdr_destroy(exists); exists = buf_hash_insert(hdr, &hash_lock); ASSERT3P(exists, ==, NULL); + } else if ((hdr->b_buf == buf) && + (bp->b_bufobj == NULL)) { + + bp->b_bufobj = &vp->v_bufobj; + bp->b_lblkno = blkno; + bp->b_blkno = blkno; + bp->b_offset = (blkno << 9); + BO_LOCK(bp->b_bufobj); + bgetvp(vp, bp); + BO_UNLOCK(bp->b_bufobj); + bp->b_flags &= ~B_INVAL; + bp->b_flags |= B_CACHE; } + hdr->b_flags &= ~ARC_IO_IN_PROGRESS; /* if it's not anon, we are doing a scrub */ if (hdr->b_state == arc_anon)