From owner-svn-src-head@freebsd.org  Wed Oct 14 07:37:04 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 51457A1267A;
 Wed, 14 Oct 2015 07:37:04 +0000 (UTC) (envelope-from mav@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 18CC217CE;
 Wed, 14 Oct 2015 07:37:04 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9E7b3H1055984;
 Wed, 14 Oct 2015 07:37:03 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9E7b3pc055983;
 Wed, 14 Oct 2015 07:37:03 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201510140737.t9E7b3pc055983@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 14 Oct 2015 07:37:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289295 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2015 07:37:04 -0000

Author: mav
Date: Wed Oct 14 07:37:02 2015
New Revision: 289295
URL: https://svnweb.freebsd.org/changeset/base/289295

Log:
  MFV r289294: 5219 l2arc_write_buffers() may write beyond target_sz
  
  Reviewed by: Matthew Ahrens <mahrens@delphix.com>
  Reviewed by: Saso Kiselkov <skiselkov@gmail.com>
  Reviewed by: George Wilson <george@delphix.com>
  Reviewed by: Steven Hartland <steven.hartland@multiplay.co.uk>
  Reviewed by: Justin Gibbs <gibbs@FreeBSD.org>
  Approved by: Matthew Ahrens <mahrens@delphix.com>
  Author: Andriy Gapon <avg@freebsd.org>
  
  illumos/illumos-gate@d7d9a6d919f92d74ea0510a53f8441396048e800

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Oct 14 07:28:36 2015	(r289294)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Oct 14 07:37:02 2015	(r289295)
@@ -6243,7 +6243,8 @@ l2arc_write_buffers(spa_t *spa, l2arc_de
     boolean_t *headroom_boost)
 {
 	arc_buf_hdr_t *hdr, *hdr_prev, *head;
-	uint64_t write_asize, write_sz, headroom, buf_compress_minsz;
+	uint64_t write_asize, write_sz, headroom,
+	    buf_compress_minsz;
 	void *buf_data;
 	boolean_t full;
 	l2arc_write_callback_t *cb;
@@ -6405,6 +6406,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_de
 			 * using it to denote the header's state change.
 			 */
 			hdr->b_l2hdr.b_daddr = L2ARC_ADDR_UNSET;
+
 			hdr->b_flags |= ARC_FLAG_HAS_L2HDR;
 
 			mutex_enter(&dev->l2ad_mtx);