From e4f5fa12290016b2f1fd6a5b4c7e5733c788c863 Mon Sep 17 00:00:00 2001 From: Matthew Macy Date: Thu, 10 Oct 2019 09:47:06 -0700 Subject: Fix strdup conflict on other platforms In the FreeBSD kernel the strdup signature is: ``` char *strdup(const char *__restrict, struct malloc_type *); ``` It's unfortunate that the developers have chosen to change the signature of libc functions - but it's what I have to deal with. Reviewed-by: Jorgen Lundman Reviewed-by: Brian Behlendorf Signed-off-by: Matt Macy Closes #9433 --- module/zfs/dsl_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/zfs/dsl_pool.c') diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c index 4fffe4cb5..59104e6d1 100644 --- a/module/zfs/dsl_pool.c +++ b/module/zfs/dsl_pool.c @@ -1200,7 +1200,7 @@ dsl_pool_user_hold_rele_impl(dsl_pool_t *dp, uint64_t dsobj, error = zap_add(mos, zapobj, name, 8, 1, &now, tx); else error = zap_remove(mos, zapobj, name, tx); - strfree(name); + kmem_strfree(name); return (error); } -- cgit v1.2.3