From a9594069ccc50b4450be326845550c945d726fd1 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 29 Jun 2015 11:56:02 -0700 Subject: [PATCH] Remove double counting HDR_L2ONLY_SIZE Commit d962d5d didn't quite properly resolve the HDR_L2ONLY_SIZE accounting. Accounting is now performed only in the constructor and destructor which is a nice simplification. It should have been removed the from create and destroy functions. This brings up back in sync with upstream. Signed-off-by: Brian Behlendorf Issue #3533 --- module/zfs/arc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/zfs/arc.c b/module/zfs/arc.c index e37d9d881ca7..624f0ef0081f 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -2056,8 +2056,6 @@ arc_hdr_l2hdr_destroy(arc_buf_hdr_t *hdr) list_remove(&dev->l2ad_buflist, hdr); - arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS); - /* * We don't want to leak the b_tmp_cdata buffer that was * allocated in l2arc_write_buffers() @@ -6349,7 +6347,6 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz, * Create and add a new L2ARC header. */ hdr->b_l2hdr.b_dev = dev; - arc_space_consume(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS); hdr->b_flags |= ARC_FLAG_L2_WRITING; /* * Temporarily stash the data buffer in b_tmp_cdata.