From owner-svn-src-user@FreeBSD.ORG  Wed Nov 18 01:43:12 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 2DD651065679;
	Wed, 18 Nov 2009 01:43:12 +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 1C9AA8FC12;
	Wed, 18 Nov 2009 01:43:12 +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 nAI1hCVa051834;
	Wed, 18 Nov 2009 01:43:12 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAI1hBHo051832;
	Wed, 18 Nov 2009 01:43:12 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911180143.nAI1hBHo051832@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 18 Nov 2009 01:43:11 +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: r199466 -
	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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Nov 2009 01:43:12 -0000

Author: kmacy
Date: Wed Nov 18 01:43:11 2009
New Revision: 199466
URL: http://svn.freebsd.org/changeset/base/199466

Log:
  mark buffer invalid if it doesn't match the expect birth txg

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	Wed Nov 18 01:35:36 2009	(r199465)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Nov 18 01:43:11 2009	(r199466)
@@ -1369,7 +1369,6 @@ arc_getblk(arc_buf_t *buf)
 	struct vnode *vp;
 	struct bufobj *bo;
 	int flags = 0;
-	int preflags, postflags;
 
 	if (type == ARC_BUFC_METADATA) {
 		arc_space_consume(size);
@@ -1392,14 +1391,9 @@ arc_getblk(arc_buf_t *buf)
 		buf->b_hdr->b_flags &= ~ARC_BUF_CLONING;
 	} else {
 		newbp = getblk(vp, blkno, size, 0, 0, flags);
-		preflags = newbp->b_flags;
-
-		if (newbp->b_vp != NULL)
-			brelvp(newbp);
-		postflags = newbp->b_flags;
-
-		if (preflags != postflags)
-			CTR2(KTR_SPARE2, "arc_getblk() flags change pre %X post %X", preflags, postflags);
+		if (newbp->b_birth != buf->b_hdr->b_birth)
+			newbp->b_flags |= B_INVAL;
+		brelvp(newbp);
 		data = newbp->b_data;
 	}