summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/syscalls.master8
-rw-r--r--sys/kern/vfs_default.c4
-rw-r--r--sys/kern/vfs_extattr.c10
-rw-r--r--sys/kern/vfs_syscalls.c10
-rw-r--r--sys/kern/vfs_vnops.c14
-rw-r--r--sys/kern/vnode_if.src4
6 files changed, 25 insertions, 25 deletions
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 6e834d46d4d1..4130ff635fd1 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -508,16 +508,16 @@
354 STD BSD { int __acl_aclcheck_fd(int filedes, acl_type_t type, \
struct acl *aclp); }
355 STD BSD { int extattrctl(const char *path, int cmd, \
- const char *filename, int namespace, \
+ const char *filename, int attrnamespace, \
const char *attrname); }
356 STD BSD { int extattr_set_file(const char *path, \
- int namespace, const char *attrname, \
+ int attrnamespace, const char *attrname, \
struct iovec *iovp, unsigned iovcnt); }
357 STD BSD { int extattr_get_file(const char *path, \
- int namespace, const char *attrname, \
+ int attrnamespace, const char *attrname, \
struct iovec *iovp, unsigned iovcnt); }
358 STD BSD { int extattr_delete_file(const char *path, \
- int namespace, const char *attrname); }
+ int attrnamespace, const char *attrname); }
359 STD BSD { int aio_waitcomplete(struct aiocb **aiocbp, struct timespec *timeout); }
360 STD BSD { int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); }
361 STD BSD { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index ee56c83c30f6..d0ed3bbda78b 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -739,11 +739,11 @@ vfs_stduninit (vfsp)
}
int
-vfs_stdextattrctl(mp, cmd, filename_vp, namespace, attrname, p)
+vfs_stdextattrctl(mp, cmd, filename_vp, attrnamespace, attrname, p)
struct mount *mp;
int cmd;
struct vnode *filename_vp;
- int namespace;
+ int attrnamespace;
const char *attrname;
struct proc *p;
{
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 79abaf4a5c3c..024b50e92962 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -3726,10 +3726,10 @@ extattrctl(p, uap)
if (SCARG(uap, attrname) != NULL) {
error = VFS_EXTATTRCTL(mp, SCARG(uap, cmd), filename_vp,
- SCARG(uap, namespace), attrname, p);
+ SCARG(uap, attrnamespace), attrname, p);
} else {
error = VFS_EXTATTRCTL(mp, SCARG(uap, cmd), filename_vp,
- SCARG(uap, namespace), NULL, p);
+ SCARG(uap, attrnamespace), NULL, p);
}
vn_finished_write(mp);
@@ -3801,7 +3801,7 @@ extattr_set_file(p, uap)
iov++;
}
cnt = auio.uio_resid;
- error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
&auio, p->p_cred->pc_ucred, p);
cnt -= auio.uio_resid;
p->p_retval[0] = cnt;
@@ -3868,7 +3868,7 @@ extattr_get_file(p, uap)
iov++;
}
cnt = auio.uio_resid;
- error = VOP_GETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_GETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
&auio, p->p_cred->pc_ucred, p);
cnt -= auio.uio_resid;
p->p_retval[0] = cnt;
@@ -3904,7 +3904,7 @@ extattr_delete_file(p, uap)
NDFREE(&nd, 0);
return (error);
}
- error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
NULL, p->p_cred->pc_ucred, p);
NDFREE(&nd, 0);
vn_finished_write(mp);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 79abaf4a5c3c..024b50e92962 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -3726,10 +3726,10 @@ extattrctl(p, uap)
if (SCARG(uap, attrname) != NULL) {
error = VFS_EXTATTRCTL(mp, SCARG(uap, cmd), filename_vp,
- SCARG(uap, namespace), attrname, p);
+ SCARG(uap, attrnamespace), attrname, p);
} else {
error = VFS_EXTATTRCTL(mp, SCARG(uap, cmd), filename_vp,
- SCARG(uap, namespace), NULL, p);
+ SCARG(uap, attrnamespace), NULL, p);
}
vn_finished_write(mp);
@@ -3801,7 +3801,7 @@ extattr_set_file(p, uap)
iov++;
}
cnt = auio.uio_resid;
- error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
&auio, p->p_cred->pc_ucred, p);
cnt -= auio.uio_resid;
p->p_retval[0] = cnt;
@@ -3868,7 +3868,7 @@ extattr_get_file(p, uap)
iov++;
}
cnt = auio.uio_resid;
- error = VOP_GETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_GETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
&auio, p->p_cred->pc_ucred, p);
cnt -= auio.uio_resid;
p->p_retval[0] = cnt;
@@ -3904,7 +3904,7 @@ extattr_delete_file(p, uap)
NDFREE(&nd, 0);
return (error);
}
- error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, namespace), attrname,
+ error = VOP_SETEXTATTR(nd.ni_vp, SCARG(uap, attrnamespace), attrname,
NULL, p->p_cred->pc_ucred, p);
NDFREE(&nd, 0);
vn_finished_write(mp);
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 6c8c0f9d1779..e60328d9666b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -808,7 +808,7 @@ vn_kqfilter(struct file *fp, struct knote *kn)
* Set IO_NODELOCKED in ioflg if the vnode is already locked.
*/
int
-vn_extattr_get(struct vnode *vp, int ioflg, int namespace,
+vn_extattr_get(struct vnode *vp, int ioflg, int attrnamespace,
const char *attrname, int *buflen, char *buf, struct proc *p)
{
struct uio auio;
@@ -830,7 +830,7 @@ vn_extattr_get(struct vnode *vp, int ioflg, int namespace,
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
/* authorize attribute retrieval as kernel */
- error = VOP_GETEXTATTR(vp, namespace, attrname, &auio, NULL, p);
+ error = VOP_GETEXTATTR(vp, attrnamespace, attrname, &auio, NULL, p);
if ((ioflg & IO_NODELOCKED) == 0)
VOP_UNLOCK(vp, 0, p);
@@ -846,7 +846,7 @@ vn_extattr_get(struct vnode *vp, int ioflg, int namespace,
* XXX failure mode if partially written?
*/
int
-vn_extattr_set(struct vnode *vp, int ioflg, int namespace,
+vn_extattr_set(struct vnode *vp, int ioflg, int attrnamespace,
const char *attrname, int buflen, char *buf, struct proc *p)
{
struct uio auio;
@@ -872,7 +872,7 @@ vn_extattr_set(struct vnode *vp, int ioflg, int namespace,
}
/* authorize attribute setting as kernel */
- error = VOP_SETEXTATTR(vp, namespace, attrname, &auio, NULL, p);
+ error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio, NULL, p);
if ((ioflg & IO_NODELOCKED) == 0) {
vn_finished_write(mp);
@@ -883,8 +883,8 @@ vn_extattr_set(struct vnode *vp, int ioflg, int namespace,
}
int
-vn_extattr_rm(struct vnode *vp, int ioflg, int namespace, const char *attrname,
- struct proc *p)
+vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace,
+ const char *attrname, struct proc *p)
{
struct mount *mp;
int error;
@@ -896,7 +896,7 @@ vn_extattr_rm(struct vnode *vp, int ioflg, int namespace, const char *attrname,
}
/* authorize attribute removal as kernel */
- error = VOP_SETEXTATTR(vp, namespace, attrname, NULL, NULL, p);
+ error = VOP_SETEXTATTR(vp, attrnamespace, attrname, NULL, NULL, p);
if ((ioflg & IO_NODELOCKED) == 0) {
vn_finished_write(mp);
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 9cbe079e8068..dd22b80f2455 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -529,7 +529,7 @@ vop_aclcheck {
#
vop_getextattr {
IN struct vnode *vp;
- IN int namespace;
+ IN int attrnamespace;
IN const char *name;
INOUT struct uio *uio;
IN struct ucred *cred;
@@ -541,7 +541,7 @@ vop_getextattr {
#
vop_setextattr {
IN struct vnode *vp;
- IN int namespace;
+ IN int attrnamespace;
IN const char *name;
INOUT struct uio *uio;
IN struct ucred *cred;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-05 12:57:40 +0000