From owner-svn-src-user@FreeBSD.ORG  Sun Nov  1 23:59:23 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 CF52E106566B;
	Sun,  1 Nov 2009 23:59:23 +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 BE9EF8FC0C;
	Sun,  1 Nov 2009 23:59:23 +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 nA1NxNiX038968;
	Sun, 1 Nov 2009 23:59:23 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA1NxN2Y038966;
	Sun, 1 Nov 2009 23:59:23 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911012359.nA1NxN2Y038966@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 1 Nov 2009 23:59:23 +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: r198777 -
	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: Sun, 01 Nov 2009 23:59:23 -0000

Author: kmacy
Date: Sun Nov  1 23:59:23 2009
New Revision: 198777
URL: http://svn.freebsd.org/changeset/base/198777

Log:
  if a block is already cached we need to free the corresponding buffer

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 21:48:18 2009	(r198776)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Nov  1 23:59:23 2009	(r198777)
@@ -3357,14 +3357,21 @@ arc_write_done(zio_t *zio)
 			ASSERT3P(exists, ==, NULL);
 		} else if ((hdr->b_buf == buf) &&
 		    (bp->b_bufobj == NULL)) {
+			struct buf *oldbp;
+			struct bufobj *bo;
 
-			bp->b_bufobj = &vp->v_bufobj;
+			oldbp = getblk(vp, blkno, bp->b_bcount, 0, 0, GB_NOCREAT);
+			if (oldbp != NULL) {
+				oldbp->b_flags |= B_INVAL;
+				brelse(oldbp);
+			}
+			bo = bp->b_bufobj = &vp->v_bufobj;
 			bp->b_lblkno = blkno;
 			bp->b_blkno = blkno;
 			bp->b_offset = (blkno << 9);
-			BO_LOCK(bp->b_bufobj);
+			BO_LOCK(bo);
 			bgetvp(vp, bp);
-			BO_UNLOCK(bp->b_bufobj);
+			BO_UNLOCK(bo);
 			bp->b_flags &= ~B_INVAL;
 			bp->b_flags |= B_CACHE;
 		}