From owner-svn-src-user@FreeBSD.ORG Thu Nov 19 01:29:10 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 CC35F106566C; Thu, 19 Nov 2009 01:29:10 +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 A0CE58FC17; Thu, 19 Nov 2009 01:29:10 +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 nAJ1TAKM089898; Thu, 19 Nov 2009 01:29:10 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJ1TAlb089896; Thu, 19 Nov 2009 01:29:10 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911190129.nAJ1TAlb089896@svn.freebsd.org> From: Kip Macy Date: Thu, 19 Nov 2009 01:29:10 +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: r199503 - 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: Thu, 19 Nov 2009 01:29:10 -0000 Author: kmacy Date: Thu Nov 19 01:29:10 2009 New Revision: 199503 URL: http://svn.freebsd.org/changeset/base/199503 Log: invalidate older buffer on first free 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 Thu Nov 19 01:27:22 2009 (r199502) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Thu Nov 19 01:29:10 2009 (r199503) @@ -1328,23 +1328,24 @@ arc_bgetvp(arc_buf_t *buf) BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo)); bremfree(bp); /* - * buffer is usable for this mapping + * buffer is not valid or is older */ - if (((bp->b_flags & (B_CACHE|B_INVAL)) == B_CACHE) && - (bp->b_birth > hdr->b_birth)) { - brelse(bp); - } else { + if (((bp->b_flags & (B_CACHE|B_INVAL)) != B_CACHE) || + (bp->b_birth <= hdr->b_birth)) { bp->b_flags |= B_INVAL; bp->b_birth = 0; - brelse(bp); - if (!(hdr->b_flags & ARC_IO_ERROR) && - (newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) { - BO_LOCK(bo); - bgetvp(vp, newbp); - BO_UNLOCK(bo); - } } - } else if (!(hdr->b_flags & ARC_IO_ERROR) && + brelse(bp); + + if ((hdr->b_datacnt == 1) && + !(hdr->b_flags & ARC_IO_ERROR) && + (newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) { + BO_LOCK(bo); + bgetvp(vp, newbp); + BO_UNLOCK(bo); + } + } else if ((hdr->b_datacnt == 1) && + !(hdr->b_flags & ARC_IO_ERROR) && (newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) { bgetvp(vp, newbp); BO_UNLOCK(bo); @@ -1419,12 +1420,10 @@ arc_brelse(arc_buf_t *buf, void *data, s return; } - if (hdr->b_datacnt == 1) { - arc_bgetvp(buf); - CTR4(KTR_SPARE2, "arc_brelse() bp=%p flags %X" - " size %ld blkno=%ld", - bp, bp->b_flags, size, bp->b_blkno); - } + arc_bgetvp(buf); + CTR4(KTR_SPARE2, "arc_brelse() bp=%p flags %X" + " size %ld blkno=%ld", + bp, bp->b_flags, size, bp->b_blkno); brelse(bp); }