d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assertion panic caused by combination of r286598 and TRIM.

Browse Source
This commit is contained in:
Alexander Motin 2015-08-11 19:15:55 +00:00
parent c68f8061cf
commit b3fc966389
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
View File

@ -2326,8 +2326,10 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
* want to re-destroy the header's L2 portion. * want to re-destroy the header's L2 portion.
*/ */
if (HDR_HAS_L2HDR(hdr)) { if (HDR_HAS_L2HDR(hdr)) {
trim_map_free(dev->l2ad_vdev, hdr->b_l2hdr.b_daddr, if (hdr->b_l2hdr.b_daddr != L2ARC_ADDR_UNSET)
hdr->b_l2hdr.b_asize, 0); trim_map_free(dev->l2ad_vdev,
hdr->b_l2hdr.b_daddr,
hdr->b_l2hdr.b_asize, 0);
arc_hdr_l2hdr_destroy(hdr); arc_hdr_l2hdr_destroy(hdr);
} }
@ -4412,8 +4414,10 @@ arc_release(arc_buf_t *buf, void *tag)
* to acquire the l2ad_mtx. * to acquire the l2ad_mtx.
*/ */
if (HDR_HAS_L2HDR(hdr)) { if (HDR_HAS_L2HDR(hdr)) {
trim_map_free(hdr->b_l2hdr.b_dev->l2ad_vdev, if (hdr->b_l2hdr.b_daddr != L2ARC_ADDR_UNSET)
hdr->b_l2hdr.b_daddr, hdr->b_l2hdr.b_asize, 0); 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); arc_hdr_l2hdr_destroy(hdr);
} }