From: Richard Yao Date: Sun, 7 Jul 2013 17:39:59 +0000 (-0400) Subject: Remove arc_data_buf_alloc()/arc_data_buf_free() X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=zfs.git;a=commitdiff_plain;h=3f4058cd15545a83b4e6e50cd7e29af45b54054a Remove arc_data_buf_alloc()/arc_data_buf_free() These functions are used in neither Illumos nor ZFSOnLinux. They appear to have been replaced by arc_buf_alloc()/arc_buf_free(), so lets remove them. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Issue #1614 --- diff --git a/include/sys/arc.h b/include/sys/arc.h index 396144a..c88c311 100644 --- a/include/sys/arc.h +++ b/include/sys/arc.h @@ -92,8 +92,6 @@ typedef enum arc_space_type { void arc_space_consume(uint64_t space, arc_space_type_t type); void arc_space_return(uint64_t space, arc_space_type_t type); -void *arc_data_buf_alloc(uint64_t space); -void arc_data_buf_free(void *buf, uint64_t space); arc_buf_t *arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type); arc_buf_t *arc_loan_buf(spa_t *spa, int size); diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 97c897d..75ce174 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -1260,23 +1260,6 @@ arc_space_return(uint64_t space, arc_space_type_t type) atomic_add_64(&arc_size, -space); } -void * -arc_data_buf_alloc(uint64_t size) -{ - if (arc_evict_needed(ARC_BUFC_DATA)) - cv_signal(&arc_reclaim_thr_cv); - atomic_add_64(&arc_size, size); - return (zio_data_buf_alloc(size)); -} - -void -arc_data_buf_free(void *buf, uint64_t size) -{ - zio_data_buf_free(buf, size); - ASSERT(arc_size >= size); - atomic_add_64(&arc_size, -size); -} - arc_buf_t * arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type) {