From e2c7d3785ad97399478421293121d7853463a3e4 Mon Sep 17 00:00:00 2001 From: cao Date: Fri, 2 Dec 2016 07:39:06 +0800 Subject: [PATCH] Remove unused sa_update_from_cb() It looks like this was functionality which was added in the original SA implementation and then never needed. It can be safely removed now and easily added back if we find a use for it. Reviewed-by: Brian Behlendorf Signed-off-by: cao.xuewen Closes #5440 --- include/sys/sa.h | 2 -- module/zfs/sa.c | 21 --------------------- 2 files changed, 23 deletions(-) diff --git a/include/sys/sa.h b/include/sys/sa.h index 01d24662a..b7ed9fe38 100644 --- a/include/sys/sa.h +++ b/include/sys/sa.h @@ -134,8 +134,6 @@ int sa_bulk_lookup(sa_handle_t *, sa_bulk_attr_t *, int count); int sa_bulk_lookup_locked(sa_handle_t *, sa_bulk_attr_t *, int count); int sa_bulk_update(sa_handle_t *, sa_bulk_attr_t *, int count, dmu_tx_t *); int sa_size(sa_handle_t *, sa_attr_type_t, int *); -int sa_update_from_cb(sa_handle_t *, sa_attr_type_t, - uint32_t buflen, sa_data_locator_t *, void *userdata, dmu_tx_t *); void sa_object_info(sa_handle_t *, dmu_object_info_t *); void sa_object_size(sa_handle_t *, uint32_t *, u_longlong_t *); void *sa_get_userdata(sa_handle_t *); diff --git a/module/zfs/sa.c b/module/zfs/sa.c index d4f412c2a..46aacfb1b 100644 --- a/module/zfs/sa.c +++ b/module/zfs/sa.c @@ -1846,26 +1846,6 @@ sa_update(sa_handle_t *hdl, sa_attr_type_t type, return (error); } -int -sa_update_from_cb(sa_handle_t *hdl, sa_attr_type_t attr, - uint32_t buflen, sa_data_locator_t *locator, void *userdata, dmu_tx_t *tx) -{ - int error; - sa_bulk_attr_t bulk; - - VERIFY3U(buflen, <=, SA_ATTR_MAX_LEN); - - bulk.sa_attr = attr; - bulk.sa_data = userdata; - bulk.sa_data_func = locator; - bulk.sa_length = buflen; - - mutex_enter(&hdl->sa_lock); - error = sa_bulk_update_impl(hdl, &bulk, 1, tx); - mutex_exit(&hdl->sa_lock); - return (error); -} - /* * Return size of an attribute */ @@ -2044,7 +2024,6 @@ EXPORT_SYMBOL(sa_bulk_lookup); EXPORT_SYMBOL(sa_bulk_lookup_locked); EXPORT_SYMBOL(sa_bulk_update); EXPORT_SYMBOL(sa_size); -EXPORT_SYMBOL(sa_update_from_cb); EXPORT_SYMBOL(sa_object_info); EXPORT_SYMBOL(sa_object_size); EXPORT_SYMBOL(sa_get_userdata);