Date: Tue, 24 Nov 2009 01:44:11 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199728 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200911240144.nAO1iB68087692@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Nov 24 01:44:11 2009 New Revision: 199728 URL: http://svn.freebsd.org/changeset/base/199728 Log: don't cache buffers that are not page aligned account for sub-page sizes in invalidation 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 01:35:21 2009 (r199727) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 24 01:44:11 2009 (r199728) @@ -1333,7 +1333,7 @@ arc_binval(spa_t *spa, dva_t *dva, uint6 BO_UNLOCK(bo); start = OFF_TO_IDX((blkno << 9)); - end = start + OFF_TO_IDX(size); + end = start + OFF_TO_IDX(size + PAGE_MASK); object = vp->v_object; VM_OBJECT_LOCK(object); @@ -1392,7 +1392,8 @@ arc_bcache(arc_buf_t *buf) newbp->b_offset = (blkno << 9); cachebuf = ((hdr->b_datacnt == 1) && !(hdr->b_flags & ARC_IO_ERROR) && - ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE)); + ((newbp->b_flags & (B_INVAL|B_CACHE)) == B_CACHE) && + (blkno & 0x7) == 0); arc_binval(hdr->b_spa, &hdr->b_dva, hdr->b_size); if (cachebuf)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911240144.nAO1iB68087692>