From owner-svn-src-user@FreeBSD.ORG Wed Nov 18 05:52:10 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 DB0B110656C2;
Wed, 18 Nov 2009 05:52:10 +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 CA0728FC26;
Wed, 18 Nov 2009 05:52:10 +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 nAI5q914060079;
Wed, 18 Nov 2009 05:52:09 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAI5q9rG060077;
Wed, 18 Nov 2009 05:52:09 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911180552.nAI5q9rG060077@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 18 Nov 2009 05:52:09 +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: r199474 -
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: Wed, 18 Nov 2009 05:52:10 -0000
Author: kmacy
Date: Wed Nov 18 05:52:09 2009
New Revision: 199474
URL: http://svn.freebsd.org/changeset/base/199474
Log:
simplify arc_bgetvp
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:44:17 2009 (r199473)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 18 05:52:09 2009 (r199474)
@@ -1332,16 +1332,12 @@ arc_bgetvp(arc_buf_t *buf)
if (((bp->b_flags & (B_CACHE|B_INVAL)) == B_CACHE) &&
(bp->b_birth > hdr->b_birth)) {
brelse(bp);
- } else if (hdr->b_flags & ARC_IO_ERROR) {
- bp->b_flags |= B_INVAL;
- bp->b_birth = 0;
- brelse(bp);
} else {
-
bp->b_flags |= B_INVAL;
bp->b_birth = 0;
brelse(bp);
- if ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) {
+ if (!(hdr->b_flags & ARC_IO_ERROR) &&
+ (newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) {
BO_LOCK(bo);
bgetvp(vp, newbp);
BO_UNLOCK(bo);