Attachment 161810 Details for Bug 203473 – proposed patch for testing

[patch] proposed patch for testing

file_203473.txt (text/plain), 2.07 KB, created by Andriy Gapon on 2015-10-07 20:58:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2015-10-07 20:58:57 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
>index 42a9a2dbf2132..acb9562470eae 100644
>--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
>+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
>@@ -1134,6 +1134,24 @@ static boolean_t l2arc_transform_buf(arc_buf_hdr_t *, boolean_t);
> static void l2arc_decompress_zio(zio_t *, arc_buf_hdr_t *, enum zio_compress);
> static void l2arc_release_cdata_buf(arc_buf_hdr_t *);
> 
>+static void
>+l2arc_trim(const arc_buf_hdr_t *hdr)
>+{
>+	l2arc_dev_t *dev = hdr->b_l2hdr.b_dev;
>+
>+	ASSERT(HDR_HAS_L2HDR(hdr));
>+	ASSERT(MUTEX_HELD(&dev->l2ad_mtx));
>+
>+	if (hdr->b_l2hdr.b_daddr == L2ARC_ADDR_UNSET)
>+		return;
>+	if (hdr->b_l2hdr.b_asize != 0) {
>+		trim_map_free(dev->l2ad_vdev, hdr->b_l2hdr.b_daddr,
>+		    hdr->b_l2hdr.b_asize, 0);
>+	} else {
>+		ASSERT3U(hdr->b_l2hdr.b_compress, ==, ZIO_COMPRESS_EMPTY);
>+	}
>+}
>+
> static uint64_t
> buf_hash(uint64_t spa, const dva_t *dva, uint64_t birth)
> {
>@@ -2449,10 +2467,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
> 		 * want to re-destroy the header's L2 portion.
> 		 */
> 		if (HDR_HAS_L2HDR(hdr)) {
>-			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);
>+			l2arc_trim(hdr);
> 			arc_hdr_l2hdr_destroy(hdr);
> 		}
> 
>@@ -4831,10 +4846,7 @@ arc_release(arc_buf_t *buf, void *tag)
> 		 * to acquire the l2ad_mtx.
> 		 */
> 		if (HDR_HAS_L2HDR(hdr)) {
>-			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);
>+			l2arc_trim(hdr);
> 			arc_hdr_l2hdr_destroy(hdr);
> 		}
> 
>@@ -5996,8 +6008,7 @@ top:
> 			 * Error - drop L2ARC entry.
> 			 */
> 			list_remove(buflist, hdr);
>-			trim_map_free(hdr->b_l2hdr.b_dev->l2ad_vdev,
>-			    hdr->b_l2hdr.b_daddr, hdr->b_l2hdr.b_asize, 0);
>+			l2arc_trim(hdr);
> 			hdr->b_flags &= ~ARC_FLAG_HAS_L2HDR;
> 
> 			ARCSTAT_INCR(arcstat_l2_asize, -hdr->b_l2hdr.b_asize);

Actions: View | Diff

Attachments on bug 203473: 161810 | 161919