From owner-svn-src-user@FreeBSD.ORG Tue Nov 24 22:37:04 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 B0A0210656A9; Tue, 24 Nov 2009 22:37:04 +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 739738FC16; Tue, 24 Nov 2009 22:37:04 +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 nAOMb4lt031633; Tue, 24 Nov 2009 22:37:04 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOMb4S9031631; Tue, 24 Nov 2009 22:37:04 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911242237.nAOMb4S9031631@svn.freebsd.org> From: Kip Macy Date: Tue, 24 Nov 2009 22:37:04 +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: r199769 - 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, 24 Nov 2009 22:37:04 -0000 Author: kmacy Date: Tue Nov 24 22:37:04 2009 New Revision: 199769 URL: http://svn.freebsd.org/changeset/base/199769 Log: when invalidating - try buffer lookup again if unaligned lookup fails 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 24 22:13:06 2009 (r199768) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 24 22:37:04 2009 (r199769) @@ -1302,7 +1302,7 @@ arc_buf_add_ref(arc_buf_t *buf, void* ta void arc_binval(spa_t *spa, dva_t *dva, uint64_t size) { - uint64_t blkno; + uint64_t blkno, blkno_lookup; struct vnode *vp; struct bufobj *bo; struct buf *bp; @@ -1317,22 +1317,26 @@ arc_binval(spa_t *spa, dva_t *dva, uint6 if (dva == NULL || spa == NULL || blkno == 0 || size == 0) return; - blkno = dva->dva_word[1] & ~(1UL<<63); + blkno_lookup = blkno = dva->dva_word[1] & ~(1UL<<63); vp = spa_get_vnode(spa); bo = &vp->v_bufobj; BO_LOCK(bo); - bp = gbincore(bo, blkno); +retry: + bp = gbincore(bo, blkno_lookup); if (bp != NULL) { BUF_LOCK(bp, LK_EXCLUSIVE | LK_INTERLOCK, BO_MTX(bo)); bremfree(bp); bp->b_flags |= B_INVAL; bp->b_birth = 0; brelse(bp); + } else if (blkno_lookup & 0x7) { + blkno_lookup &= ~0x7; + goto retry; } else BO_UNLOCK(bo); - start = OFF_TO_IDX((blkno << 9)); + start = OFF_TO_IDX((blkno_lookup << 9)); end = start + OFF_TO_IDX(size + PAGE_MASK); object = vp->v_object; @@ -1342,7 +1346,8 @@ arc_binval(spa_t *spa, dva_t *dva, uint6 #ifdef INVARIANTS for (i = 0; i < OFF_TO_IDX(size); i++) { KASSERT(vm_page_lookup(object, start + i) == NULL, - ("found page at %ld", start + i)); + ("found page at %ld blkno %ld blkno_lookup %ld", + start + i, blkno, blkno_lookup)); } #endif VM_OBJECT_UNLOCK(object);