svn commit: r199472 -
user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Kip Macy
kmacy at FreeBSD.org
Wed Nov 18 05:21:35 UTC 2009
Author: kmacy
Date: Wed Nov 18 05:21:35 2009
New Revision: 199472
URL: http://svn.freebsd.org/changeset/base/199472
Log:
always check for a buffer to invalidate
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 05:20:40 2009 (r199471)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 18 05:21:35 2009 (r199472)
@@ -1315,10 +1315,6 @@ arc_bgetvp(arc_buf_t *buf)
return;
newbp = buf->b_bp;
-
- if ((newbp->b_flags & (B_INVAL|B_CACHE)) != B_CACHE)
- return;
-
newbp->b_offset = newbp->b_birth = hdr->b_birth;
newbp->b_blkno = newbp->b_lblkno = blkno;
@@ -1340,7 +1336,7 @@ arc_bgetvp(arc_buf_t *buf)
bp->b_flags |= B_INVAL;
bp->b_birth = 0;
brelse(bp);
- } else {
+ } else if ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) {
bp->b_flags |= B_INVAL;
bp->b_birth = 0;
brelse(bp);
@@ -1348,7 +1344,8 @@ arc_bgetvp(arc_buf_t *buf)
BO_LOCK(bo);
bgetvp(vp, newbp);
BO_UNLOCK(bo);
- }
+ } else
+ brelse(bp);
} else {
newbp->b_flags |= B_CACHE;
newbp->b_flags &= ~B_INVAL;
More information about the svn-src-user
mailing list