From eedb3a62b9f16b989aa02d00db63de5dff200572 Mon Sep 17 00:00:00 2001 From: Matthew Macy Date: Thu, 10 Oct 2019 15:39:44 -0700 Subject: [PATCH] Make `zil_async_to_sync` visible to platform code FreeBSD's zvol platform code requires access to the zil_async_to_sync() function. Reviewed-by: Ryan Moeller Reviewed-by: Brian Behlendorf Signed-off-by: Matt Macy Closes #9440 --- include/sys/zil.h | 1 + module/zfs/zil.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/sys/zil.h b/include/sys/zil.h index 6b038a9dd2..e84fb864ab 100644 --- a/include/sys/zil.h +++ b/include/sys/zil.h @@ -493,6 +493,7 @@ extern itx_t *zil_itx_create(uint64_t txtype, size_t lrsize); extern void zil_itx_destroy(itx_t *itx); extern void zil_itx_assign(zilog_t *zilog, itx_t *itx, dmu_tx_t *tx); +extern void zil_async_to_sync(zilog_t *zilog, uint64_t oid); extern void zil_commit(zilog_t *zilog, uint64_t oid); extern void zil_commit_impl(zilog_t *zilog, uint64_t oid); diff --git a/module/zfs/zil.c b/module/zfs/zil.c index 7e65ac0903..0a62ace144 100644 --- a/module/zfs/zil.c +++ b/module/zfs/zil.c @@ -135,8 +135,6 @@ unsigned long zil_slog_bulk = 768 * 1024; static kmem_cache_t *zil_lwb_cache; static kmem_cache_t *zil_zcw_cache; -static void zil_async_to_sync(zilog_t *zilog, uint64_t foid); - #define LWB_EMPTY(lwb) ((BP_GET_LSIZE(&lwb->lwb_blk) - \ sizeof (zil_chain_t)) == (lwb->lwb_sz - lwb->lwb_nused)) @@ -2089,7 +2087,7 @@ zil_get_commit_list(zilog_t *zilog) /* * Move the async itxs for a specified object to commit into sync lists. */ -static void +void zil_async_to_sync(zilog_t *zilog, uint64_t foid) { uint64_t otxg, txg;