From owner-svn-src-user@FreeBSD.ORG Tue Nov 3 01:09:24 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 62098106566C; Tue, 3 Nov 2009 01:09:24 +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 50E0A8FC0C; Tue, 3 Nov 2009 01:09:24 +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 nA319O5d075407; Tue, 3 Nov 2009 01:09:24 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA319N8R075405; Tue, 3 Nov 2009 01:09:23 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911030109.nA319N8R075405@svn.freebsd.org> From: Kip Macy Date: Tue, 3 Nov 2009 01:09: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: r198836 - 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: Tue, 03 Nov 2009 01:09:24 -0000 Author: kmacy Date: Tue Nov 3 01:09:23 2009 New Revision: 198836 URL: http://svn.freebsd.org/changeset/base/198836 Log: eliminate uninitialized variable 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 Tue Nov 3 01:03:58 2009 (r198835) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 01:09:23 2009 (r198836) @@ -1367,7 +1367,6 @@ arc_brelse(arc_buf_t *buf, void *data, s static void arc_binval(arc_buf_t *buf, off_t blkno, struct vnode *vp, size_t size, struct buf *newbp) { - arc_buf_hdr_t *hdr; arc_buf_t *tbuf; int released = 0, gotvp = 0; struct buf *bp = NULL; @@ -1392,7 +1391,7 @@ arc_binval(arc_buf_t *buf, off_t blkno, bo = newbp->b_bufobj = &vp->v_bufobj; newbp->b_lblkno = blkno; newbp->b_blkno = blkno; - newbp->b_offset = hdr->b_birth; + newbp->b_offset = buf->b_hdr->b_birth; newbp->b_flags &= ~B_INVAL; newbp->b_flags |= B_CACHE; @@ -1417,7 +1416,7 @@ arc_binval(arc_buf_t *buf, off_t blkno, } if (!gotvp) bgetvp(vp, newbp); - BO_UNLOCK(&vp->v_bufobj); + BO_UNLOCK(bo); } /*