diff options
| author | Matthew Macy <[email protected]> | 2019-10-10 09:47:06 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-10-10 09:47:06 -0700 |
| commit | e4f5fa12290016b2f1fd6a5b4c7e5733c788c863 (patch) | |
| tree | 51a33853a1161198daf1195ec09da33e9a905392 /module/os/linux/zfs/zpl_xattr.c | |
| parent | c5858ff9462719be60b2ffb0065dd01508a63162 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9433
Diffstat (limited to 'module/os/linux/zfs/zpl_xattr.c')
| -rw-r--r-- | module/os/linux/zfs/zpl_xattr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/module/os/linux/zfs/zpl_xattr.c b/module/os/linux/zfs/zpl_xattr.c index 95523f28e..082287b00 100644 --- a/module/os/linux/zfs/zpl_xattr.c +++ b/module/os/linux/zfs/zpl_xattr.c @@ -707,7 +707,7 @@ __zpl_xattr_user_get(struct inode *ip, const char *name, xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name); error = zpl_xattr_get(ip, xattr_name, value, size); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } @@ -729,7 +729,7 @@ __zpl_xattr_user_set(struct inode *ip, const char *name, xattr_name = kmem_asprintf("%s%s", XATTR_USER_PREFIX, name); error = zpl_xattr_set(ip, xattr_name, value, size, flags); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } @@ -776,7 +776,7 @@ __zpl_xattr_trusted_get(struct inode *ip, const char *name, #endif xattr_name = kmem_asprintf("%s%s", XATTR_TRUSTED_PREFIX, name); error = zpl_xattr_get(ip, xattr_name, value, size); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } @@ -798,7 +798,7 @@ __zpl_xattr_trusted_set(struct inode *ip, const char *name, #endif xattr_name = kmem_asprintf("%s%s", XATTR_TRUSTED_PREFIX, name); error = zpl_xattr_set(ip, xattr_name, value, size, flags); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } @@ -845,7 +845,7 @@ __zpl_xattr_security_get(struct inode *ip, const char *name, #endif xattr_name = kmem_asprintf("%s%s", XATTR_SECURITY_PREFIX, name); error = zpl_xattr_get(ip, xattr_name, value, size); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } @@ -864,7 +864,7 @@ __zpl_xattr_security_set(struct inode *ip, const char *name, #endif xattr_name = kmem_asprintf("%s%s", XATTR_SECURITY_PREFIX, name); error = zpl_xattr_set(ip, xattr_name, value, size, flags); - strfree(xattr_name); + kmem_strfree(xattr_name); return (error); } |