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 <behlendorf1@llnl.gov>
Issue #3533

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index e37d9d881ca728e1b35b263df5e67cbffd822034..624f0ef0081fad36884996c96a69a2775f974bb5 100644 (file)
--- 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.