From owner-svn-src-all@freebsd.org Tue Nov 17 15:10:26 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F13BA31FDE; Tue, 17 Nov 2015 15:10:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34D5113B2; Tue, 17 Nov 2015 15:10:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHFAPfk051149; Tue, 17 Nov 2015 15:10:25 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHFAPKF051148; Tue, 17 Nov 2015 15:10:25 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201511171510.tAHFAPKF051148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 17 Nov 2015 15:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290983 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 15:10:26 -0000 Author: avg Date: Tue Nov 17 15:10:24 2015 New Revision: 290983 URL: https://svnweb.freebsd.org/changeset/base/290983 Log: MFC r290191: l2arc: do not call trim_map_free() for blocks with zero b_asize The code in this branch has become quite outdated, so the change had to be applied by hand. PR: 203473 Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 17 14:39:33 2015 (r290982) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 17 15:10:24 2015 (r290983) @@ -825,6 +825,19 @@ static void l2arc_decompress_zio(zio_t * enum zio_compress c); static void l2arc_release_cdata_buf(arc_buf_hdr_t *ab); +static void +l2arc_trim(const l2arc_buf_hdr_t *l2hdr) +{ + ASSERT(MUTEX_HELD(&l2arc_buflist_mtx)); + + if (l2hdr->b_asize != 0) { + trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, + l2hdr->b_asize, 0); + } else { + ASSERT3U(l2hdr->b_compress, ==, ZIO_COMPRESS_EMPTY); + } +} + static uint64_t buf_hash(uint64_t spa, const dva_t *dva, uint64_t birth) { @@ -1739,8 +1752,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr) } if (l2hdr != NULL) { - trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - l2hdr->b_asize, 0); + l2arc_trim(l2hdr); list_remove(l2hdr->b_dev->l2ad_buflist, hdr); ARCSTAT_INCR(arcstat_l2_size, -hdr->b_size); ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); @@ -3674,8 +3686,7 @@ arc_release(arc_buf_t *buf, void *tag) if (l2hdr) { ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); - trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - l2hdr->b_asize, 0); + l2arc_trim(l2hdr); kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -buf_size); mutex_exit(&l2arc_buflist_mtx); @@ -4623,8 +4634,7 @@ l2arc_write_done(zio_t *zio) list_remove(buflist, ab); ARCSTAT_INCR(arcstat_l2_asize, -abl2->b_asize); ab->b_l2hdr = NULL; - trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, - abl2->b_asize, 0); + l2arc_trim(abl2); kmem_free(abl2, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -ab->b_size); }