Date: Tue, 24 Nov 2009 22:37:04 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199769 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200911242237.nAOMb4S9031631@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911242237.nAOMb4S9031631>