From owner-svn-src-user@FreeBSD.ORG Wed Nov 18 05:44:18 2009 Return-Path: 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 563841065694; Wed, 18 Nov 2009 05:44:18 +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 451E18FC15; Wed, 18 Nov 2009 05:44:18 +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 nAI5iIB5059878; Wed, 18 Nov 2009 05:44:18 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAI5iIm4059876; Wed, 18 Nov 2009 05:44:18 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911180544.nAI5iIm4059876@svn.freebsd.org> From: Kip Macy Date: Wed, 18 Nov 2009 05:44:18 +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: r199473 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 05:44:18 -0000 Author: kmacy Date: Wed Nov 18 05:44:17 2009 New Revision: 199473 URL: http://svn.freebsd.org/changeset/base/199473 Log: always invalidate older cached 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 Wed Nov 18 05:21:35 2009 (r199472) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Wed Nov 18 05:44:17 2009 (r199473) @@ -1336,16 +1336,17 @@ arc_bgetvp(arc_buf_t *buf) bp->b_flags |= B_INVAL; bp->b_birth = 0; brelse(bp); - } else if ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) { + } else { + bp->b_flags |= B_INVAL; bp->b_birth = 0; brelse(bp); - - BO_LOCK(bo); - bgetvp(vp, newbp); - BO_UNLOCK(bo); - } else - brelse(bp); + if ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) { + BO_LOCK(bo); + bgetvp(vp, newbp); + BO_UNLOCK(bo); + } + } } else { newbp->b_flags |= B_CACHE; newbp->b_flags &= ~B_INVAL;