From owner-svn-src-user@FreeBSD.ORG  Tue Nov 17 05:59:27 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 CEDC0106566B;
	Tue, 17 Nov 2009 05:59:27 +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 BCA148FC15;
	Tue, 17 Nov 2009 05:59:27 +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 nAH5xQkR093040;
	Tue, 17 Nov 2009 05:59:26 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAH5xQGT093038;
	Tue, 17 Nov 2009 05:59:26 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911170559.nAH5xQGT093038@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 17 Nov 2009 05:59:26 +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: r199345 -
	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: Tue, 17 Nov 2009 05:59:27 -0000

Author: kmacy
Date: Tue Nov 17 05:59:26 2009
New Revision: 199345
URL: http://svn.freebsd.org/changeset/base/199345

Log:
  associate buf with vnode if none exists currently

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	Tue Nov 17 05:25:55 2009	(r199344)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Nov 17 05:59:26 2009	(r199345)
@@ -1337,8 +1337,13 @@ arc_bgetvp(arc_buf_t *buf)
 			BO_UNLOCK(bo);
 		} else
 			brelse(bp);
-	} else
+	} else {
+		buf->b_bp->b_flags |= B_CACHE;
+		buf->b_bp->b_flags &= ~B_INVAL;
+		bgetvp(vp, buf->b_bp);
 		BO_UNLOCK(bo);
+	}
+	
 }
 
 static void
@@ -1384,7 +1389,7 @@ arc_getblk(arc_buf_t *buf)
 		postflags = newbp->b_flags;
 
 		if (preflags != postflags)
-		CTR2(KTR_SPARE2, "arc_getblk() flags change pre %X post %X", preflags, postflags);
+			CTR2(KTR_SPARE2, "arc_getblk() flags change pre %X post %X", preflags, postflags);
 		data = newbp->b_data;
 	}