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 <[email protected]> Reviewed by: Saso Kiselkov <[email protected]> Reviewed by: George Wilson <[email protected]> Reviewed by: Steven Hartland <[email protected]> Reviewed by: Justin Gibbs <[email protected]> Approved by: Matthew Ahrens <[email protected]> Author: Andriy Gapon <[email protected]> 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); _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
