svn commit: r288565 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Oct  3 07:53:08 2015
New Revision: 288565
URL: https://svnweb.freebsd.org/changeset/base/288565

Log:
  MFC r286647: Fix assertion panic caused by combination of r286598 and TRIM.

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	Sat Oct  3 07:52:11 2015	(r288564)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Oct  3 07:53:08 2015	(r288565)
@@ -2329,8 +2329,10 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
 		 * want to re-destroy the header's L2 portion.
 		 */
 		if (HDR_HAS_L2HDR(hdr)) {
-			trim_map_free(dev->l2ad_vdev, hdr->b_l2hdr.b_daddr,
-			    hdr->b_l2hdr.b_asize, 0);
+			if (hdr->b_l2hdr.b_daddr != L2ARC_ADDR_UNSET)
+				trim_map_free(dev->l2ad_vdev,
+				    hdr->b_l2hdr.b_daddr,
+				    hdr->b_l2hdr.b_asize, 0);
 			arc_hdr_l2hdr_destroy(hdr);
 		}
 
@@ -4415,8 +4417,10 @@ arc_release(arc_buf_t *buf, void *tag)
 		 * to acquire the l2ad_mtx.
 		 */
 		if (HDR_HAS_L2HDR(hdr)) {
-			trim_map_free(hdr->b_l2hdr.b_dev->l2ad_vdev,
-			    hdr->b_l2hdr.b_daddr, hdr->b_l2hdr.b_asize, 0);
+			if (hdr->b_l2hdr.b_daddr != L2ARC_ADDR_UNSET)
+				trim_map_free(hdr->b_l2hdr.b_dev->l2ad_vdev,
+				    hdr->b_l2hdr.b_daddr,
+				    hdr->b_l2hdr.b_asize, 0);
 			arc_hdr_l2hdr_destroy(hdr);
 		}