From owner-svn-src-user@FreeBSD.ORG Mon Nov 23 23:43:48 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 105F3106566B;
Mon, 23 Nov 2009 23:43:48 +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 E8FAA8FC0C;
Mon, 23 Nov 2009 23:43:47 +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 nANNhlBr085099;
Mon, 23 Nov 2009 23:43:47 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nANNhlDf085097;
Mon, 23 Nov 2009 23:43:47 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911232343.nANNhlDf085097@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 23 Nov 2009 23:43:47 +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: r199725 -
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" <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: Mon, 23 Nov 2009 23:43:48 -0000
Author: kmacy
Date: Mon Nov 23 23:43:47 2009
New Revision: 199725
URL: http://svn.freebsd.org/changeset/base/199725
Log:
- simplify buffer invalidation
- mark buffers for logging purposes
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 Mon Nov 23 23:28:25 2009 (r199724)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov 23 23:43:47 2009 (r199725)
@@ -1314,7 +1314,7 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
if (zfs_page_cache_disable)
return;
- if (dva == NULL || spa == NULL || blkno == 0)
+ if (dva == NULL || spa == NULL || blkno == 0 || size == 0)
return;
blkno = dva->dva_word[1] & ~(1UL<<63);
@@ -1324,9 +1324,6 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
BO_LOCK(bo);
bp = gbincore(bo, blkno);
if (bp != NULL) {
- /*
- * XXX we have a race with getblk here
- */
BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo));
bremfree(bp);
bp->b_flags |= B_INVAL;
@@ -1339,8 +1336,6 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
end = start + OFF_TO_IDX(size);
object = vp->v_object;
- if (size == 0)
- return;
VM_OBJECT_LOCK(object);
vm_page_cache_free(object, start, end);
vm_object_page_remove(object, start, end, FALSE);
@@ -1354,7 +1349,7 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
}
static void
-arc_pcache(struct vnode *vp, struct buf *bp, uint64_t blkno, int lockneeded)
+arc_pcache(struct vnode *vp, struct buf *bp, uint64_t blkno)
{
vm_pindex_t start = OFF_TO_IDX((blkno << 9));
vm_object_t object = vp->v_object;
@@ -1362,18 +1357,17 @@ arc_pcache(struct vnode *vp, struct buf
vm_page_t m;
int i;
- if (lockneeded)
- BO_LOCK(bo);
+ BO_LOCK(bo);
bgetvp(vp, bp);
BO_UNLOCK(bo);
VM_OBJECT_LOCK(object);
- vm_page_cache_free(object, start, start + bp->b_npages);
for (i = 0; i < bp->b_npages; i++) {
m = bp->b_pages[i];
vm_page_insert(m, object, start + i);
}
VM_OBJECT_UNLOCK(object);
+ bp->b_flags |= B_VMIO;
}
static void
@@ -1400,27 +1394,9 @@ arc_bcache(arc_buf_t *buf)
!(hdr->b_flags & ARC_IO_ERROR) &&
((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE));
- BO_LOCK(bo);
- bp = gbincore(bo, blkno);
- if (bp != NULL) {
- BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo));
- bremfree(bp);
-
- /*
- * buffer is not valid or is older
- */
- 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 (cachebuf)
- arc_pcache(vp, newbp, blkno, TRUE);
- } else if (cachebuf)
- arc_pcache(vp, newbp, blkno, FALSE);
- else
- BO_UNLOCK(bo);
+ arc_binval(hdr->b_spa, &hdr->b_dva, hdr->b_size);
+ if (cachebuf)
+ arc_pcache(vp, newbp, blkno);
}
@@ -1537,6 +1513,7 @@ arc_brelse(arc_buf_t *buf, void *data, s
" size %ld blkno=%ld",
bp, bp->b_flags, size, bp->b_blkno);
+ bp->b_flags |= B_ZFS;
brelse(bp);
}