diff options
| author | Matthew Macy <mmacy@freebsd.org> | 2019-10-10 16:47:06 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2019-10-10 16:47:06 +0000 |
| commit | e4f5fa12290016b2f1fd6a5b4c7e5733c788c863 (patch) | |
| tree | 51a33853a1161198daf1195ec09da33e9a905392 /module/zfs/dsl_pool.c | |
| parent | c5858ff9462719be60b2ffb0065dd01508a63162 (diff) | |
| download | src-e4f5fa12290016b2f1fd6a5b4c7e5733c788c863.tar.gz src-e4f5fa12290016b2f1fd6a5b4c7e5733c788c863.zip | |
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 <lundman@lundman.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9433
Diffstat (limited to 'module/zfs/dsl_pool.c')
| -rw-r--r-- | module/zfs/dsl_pool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c index 4fffe4cb5a34..59104e6d104f 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); } |