From owner-svn-src-user@FreeBSD.ORG Tue Nov 3 01:03:58 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 AF4151065670; Tue, 3 Nov 2009 01:03:58 +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 9E7258FC0A; Tue, 3 Nov 2009 01:03:58 +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 nA313wBj075271; Tue, 3 Nov 2009 01:03:58 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA313wPg075269; Tue, 3 Nov 2009 01:03:58 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911030103.nA313wPg075269@svn.freebsd.org> From: Kip Macy Date: Tue, 3 Nov 2009 01:03:58 +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: r198835 - 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:03:58 -0000 Author: kmacy Date: Tue Nov 3 01:03:58 2009 New Revision: 198835 URL: http://svn.freebsd.org/changeset/base/198835 Log: fix compile errors 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 00:53:06 2009 (r198834) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 01:03:58 2009 (r198835) @@ -491,7 +491,8 @@ static void arc_get_data_buf(arc_buf_t * static void arc_access(arc_buf_hdr_t *buf, kmutex_t *hash_lock); static int arc_evict_needed(arc_buf_contents_t type); static void arc_evict_ghost(arc_state_t *state, spa_t *spa, int64_t bytes); -static void arc_binval(arc_buf_t *buf, off_t blkno, struct vnode *vp, size_t size); +static void arc_binval(arc_buf_t *buf, off_t blkno, struct vnode *vp, + size_t size, struct buf *bp); #define GHOST_STATE(state) \ ((state) == arc_mru_ghost || (state) == arc_mfu_ghost || \ @@ -1328,8 +1329,8 @@ arc_getblk(arc_buf_t *buf) if (buf->b_hdr->b_flags & ARC_BUF_CLONING) { vp = spa_get_vnode(spa); - arc_binval(buf, blkno, vp, size, newbp); bcopy(buf->b_next->b_data, newbp->b_data, size); + arc_binval(buf, blkno, vp, size, newbp); buf->b_hdr->b_flags &= ~ARC_BUF_CLONING; } #ifdef LOGALL @@ -1371,7 +1372,8 @@ arc_binval(arc_buf_t *buf, off_t blkno, int released = 0, gotvp = 0; struct buf *bp = NULL; uint64_t birth; - + struct bufobj *bo; + /* * disassociate backing buffers from the vnode * @@ -1387,7 +1389,7 @@ arc_binval(arc_buf_t *buf, off_t blkno, released = 1; } } - newbp->b_bufobj = &vp->v_bufobj; + bo = newbp->b_bufobj = &vp->v_bufobj; newbp->b_lblkno = blkno; newbp->b_blkno = blkno; newbp->b_offset = hdr->b_birth;