Author: mav
Date: Fri Nov 13 09:17:48 2015
New Revision: 290749
URL: https://svnweb.freebsd.org/changeset/base/290749
Log:
MFC r289295: 5219 l2arc_write_buffers() may write beyond target_sz
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Saso Kiselkov <skisel...@gmail.com>
Reviewed by: George Wilson <geo...@delphix.com>
Reviewed by: Steven Hartland <steven.hartl...@multiplay.co.uk>
Reviewed by: Justin Gibbs <gi...@freebsd.org>
Approved by: Matthew Ahrens <mahr...@delphix.com>
Author: Andriy Gapon <a...@freebsd.org>
illumos/illumos-gate@d7d9a6d919f92d74ea0510a53f8441396048e800
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Nov
13 09:16:56 2015 (r290748)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Nov
13 09:17:48 2015 (r290749)
@@ -6246,7 +6246,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;
@@ -6408,6 +6409,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);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
