mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-30 04:22:44 +00:00
Merge 4142468ff4
into f2233ac33a
This commit is contained in:
commit
dc98c1a84d
@ -98,7 +98,7 @@ error_to_xattrerror(int attrnamespace, int error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
xatrr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname)
|
xattr_to_extattr(const char *uattrname, int *attrnamespace, char *attrname)
|
||||||
{
|
{
|
||||||
char uname[LINUX_XATTR_NAME_MAX + 1], *dot;
|
char uname[LINUX_XATTR_NAME_MAX + 1], *dot;
|
||||||
size_t len, cplen;
|
size_t len, cplen;
|
||||||
@ -255,7 +255,7 @@ removexattr(struct thread *td, struct removexattr_args *args)
|
|||||||
char attrname[LINUX_XATTR_NAME_MAX + 1];
|
char attrname[LINUX_XATTR_NAME_MAX + 1];
|
||||||
int attrnamespace, error;
|
int attrnamespace, error;
|
||||||
|
|
||||||
error = xatrr_to_extattr(args->name, &attrnamespace, attrname);
|
error = xattr_to_extattr(args->name, &attrnamespace, attrname);
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
return (error);
|
return (error);
|
||||||
if (args->path != NULL)
|
if (args->path != NULL)
|
||||||
@ -312,7 +312,7 @@ getxattr(struct thread *td, struct getxattr_args *args)
|
|||||||
char attrname[LINUX_XATTR_NAME_MAX + 1];
|
char attrname[LINUX_XATTR_NAME_MAX + 1];
|
||||||
int attrnamespace, error;
|
int attrnamespace, error;
|
||||||
|
|
||||||
error = xatrr_to_extattr(args->name, &attrnamespace, attrname);
|
error = xattr_to_extattr(args->name, &attrnamespace, attrname);
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
return (error);
|
return (error);
|
||||||
if (args->path != NULL)
|
if (args->path != NULL)
|
||||||
@ -378,7 +378,7 @@ setxattr(struct thread *td, struct setxattr_args *args)
|
|||||||
if ((args->flags & ~(LINUX_XATTR_FLAGS)) != 0 ||
|
if ((args->flags & ~(LINUX_XATTR_FLAGS)) != 0 ||
|
||||||
args->flags == (LINUX_XATTR_FLAGS))
|
args->flags == (LINUX_XATTR_FLAGS))
|
||||||
return (EINVAL);
|
return (EINVAL);
|
||||||
error = xatrr_to_extattr(args->name, &attrnamespace, attrname);
|
error = xattr_to_extattr(args->name, &attrnamespace, attrname);
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
return (error);
|
return (error);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user