aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2015-06-29 11:56:02 -0700
committerBrian Behlendorf <[email protected]>2015-07-23 09:42:44 -0700
commit3056818343048a7406f34a0a050d6b2733d8a813 (patch)
treebc42459b896cbdbb13f7384703a78668a8dba1f1 /module/zfs
parent8c8af9d807cfed74c786c076ef4f708b7ccdc51b (diff)
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 <[email protected]> Issue #3533
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/arc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index e37d9d881..624f0ef00 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.