diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/init_sysent.c | 21 | ||||
| -rw-r--r-- | sys/kern/syscalls.c | 14 | ||||
| -rw-r--r-- | sys/kern/vnode_if.c | 76 | ||||
| -rw-r--r-- | sys/sys/syscall.h | 25 | ||||
| -rw-r--r-- | sys/sys/syscallargs.h | 66 | ||||
| -rw-r--r-- | sys/sys/vnode_if.h | 29 |
6 files changed, 10 insertions, 221 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index c523d97b6b2..979ed123775 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.86 2005/06/17 20:53:13 millert Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.87 2005/07/03 20:14:19 drahn Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.77 2005/06/17 20:39:14 millert Exp + * created from; OpenBSD: syscalls.master,v 1.78 2005/07/03 20:13:59 drahn Exp */ #include <sys/param.h> @@ -720,22 +720,6 @@ struct sysent sysent[] = { sys_munlockall }, /* 272 = munlockall */ { 3, s(struct sys_getpeereid_args), sys_getpeereid }, /* 273 = getpeereid */ -#ifdef UFS_EXTATTR - { 5, s(struct sys_extattrctl_args), - sys_extattrctl }, /* 274 = extattrctl */ - { 5, s(struct sys_extattr_set_file_args), - sys_extattr_set_file }, /* 275 = extattr_set_file */ - { 5, s(struct sys_extattr_get_file_args), - sys_extattr_get_file }, /* 276 = extattr_get_file */ - { 3, s(struct sys_extattr_delete_file_args), - sys_extattr_delete_file }, /* 277 = extattr_delete_file */ - { 5, s(struct sys_extattr_set_fd_args), - sys_extattr_set_fd }, /* 278 = extattr_set_fd */ - { 5, s(struct sys_extattr_get_fd_args), - sys_extattr_get_fd }, /* 279 = extattr_get_fd */ - { 3, s(struct sys_extattr_delete_fd_args), - sys_extattr_delete_fd }, /* 280 = extattr_delete_fd */ -#else { 0, 0, sys_nosys }, /* 274 = unimplemented sys_extattrctl */ { 0, 0, @@ -750,7 +734,6 @@ struct sysent sysent[] = { sys_nosys }, /* 279 = unimplemented sys_extattr_get_fd */ { 0, 0, sys_nosys }, /* 280 = unimplemented sys_extattr_delete_fd */ -#endif { 3, s(struct sys_getresuid_args), sys_getresuid }, /* 281 = getresuid */ { 3, s(struct sys_setresuid_args), diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index fb92d87500c..d8f6a7de78d 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.87 2005/06/17 20:42:32 millert Exp $ */ +/* $OpenBSD: syscalls.c,v 1.88 2005/07/03 20:14:19 drahn Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.77 2005/06/17 20:39:14 millert Exp + * created from; OpenBSD: syscalls.master,v 1.78 2005/07/03 20:13:59 drahn Exp */ char *syscallnames[] = { @@ -363,15 +363,6 @@ char *syscallnames[] = { "mlockall", /* 271 = mlockall */ "munlockall", /* 272 = munlockall */ "getpeereid", /* 273 = getpeereid */ -#ifdef UFS_EXTATTR - "extattrctl", /* 274 = extattrctl */ - "extattr_set_file", /* 275 = extattr_set_file */ - "extattr_get_file", /* 276 = extattr_get_file */ - "extattr_delete_file", /* 277 = extattr_delete_file */ - "extattr_set_fd", /* 278 = extattr_set_fd */ - "extattr_get_fd", /* 279 = extattr_get_fd */ - "extattr_delete_fd", /* 280 = extattr_delete_fd */ -#else "#274 (unimplemented sys_extattrctl)", /* 274 = unimplemented sys_extattrctl */ "#275 (unimplemented sys_extattr_set_file)", /* 275 = unimplemented sys_extattr_set_file */ "#276 (unimplemented sys_extattr_get_file)", /* 276 = unimplemented sys_extattr_get_file */ @@ -379,7 +370,6 @@ char *syscallnames[] = { "#278 (unimplemented sys_extattr_set_fd)", /* 278 = unimplemented sys_extattr_set_fd */ "#279 (unimplemented sys_extattr_get_fd)", /* 279 = unimplemented sys_extattr_get_fd */ "#280 (unimplemented sys_extattr_delete_fd)", /* 280 = unimplemented sys_extattr_delete_fd */ -#endif "getresuid", /* 281 = getresuid */ "setresuid", /* 282 = setresuid */ "getresgid", /* 283 = getresgid */ diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c index 5023e20f836..f68404f783c 100644 --- a/sys/kern/vnode_if.c +++ b/sys/kern/vnode_if.c @@ -3,7 +3,7 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.27 2005/07/03 01:07:44 jaredy Exp + * OpenBSD: vnode_if.src,v 1.28 2005/07/03 20:14:00 drahn Exp * by the script: * OpenBSD: vnode_if.sh,v 1.14 2005/05/22 21:07:23 pedro Exp */ @@ -1197,78 +1197,6 @@ int VOP_REALLOCBLKS(vp, buflist) return (VCALL(vp, VOFFSET(vop_reallocblks), &a)); } -int vop_getextattr_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_getextattr_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_getextattr_desc = { - 0, - "vop_getextattr", - 0, - vop_getextattr_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_getextattr_args, a_cred), - VOPARG_OFFSETOF(struct vop_getextattr_args, a_p), - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_GETEXTATTR(vp, attrnamespace, name, uio, size, cred, p) - struct vnode *vp; - int attrnamespace; - const char *name; - struct uio *uio; - size_t *size; - struct ucred *cred; - struct proc *p; -{ - struct vop_getextattr_args a; - a.a_desc = VDESC(vop_getextattr); - a.a_vp = vp; - a.a_attrnamespace = attrnamespace; - a.a_name = name; - a.a_uio = uio; - a.a_size = size; - a.a_cred = cred; - a.a_p = p; - return (VCALL(vp, VOFFSET(vop_getextattr), &a)); -} - -int vop_setextattr_vp_offsets[] = { - VOPARG_OFFSETOF(struct vop_setextattr_args,a_vp), - VDESC_NO_OFFSET -}; -struct vnodeop_desc vop_setextattr_desc = { - 0, - "vop_setextattr", - 0, - vop_setextattr_vp_offsets, - VDESC_NO_OFFSET, - VOPARG_OFFSETOF(struct vop_setextattr_args, a_cred), - VOPARG_OFFSETOF(struct vop_setextattr_args, a_p), - VDESC_NO_OFFSET, - NULL, -}; - -int VOP_SETEXTATTR(vp, attrnamespace, name, uio, cred, p) - struct vnode *vp; - int attrnamespace; - const char *name; - struct uio *uio; - struct ucred *cred; - struct proc *p; -{ - struct vop_setextattr_args a; - a.a_desc = VDESC(vop_setextattr); - a.a_vp = vp; - a.a_attrnamespace = attrnamespace; - a.a_name = name; - a.a_uio = uio; - a.a_cred = cred; - a.a_p = p; - return (VCALL(vp, VOFFSET(vop_setextattr), &a)); -} - /* Special cases: */ int vop_strategy_vp_offsets[] = { @@ -1361,8 +1289,6 @@ struct vnodeop_desc *vfs_op_descs[] = { &vop_pathconf_desc, &vop_advlock_desc, &vop_reallocblks_desc, - &vop_getextattr_desc, - &vop_setextattr_desc, NULL }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index caed72fbca4..c13f02884ba 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.85 2005/06/17 20:42:32 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.86 2005/07/03 20:14:19 drahn Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.77 2005/06/17 20:39:14 millert Exp + * created from; OpenBSD: syscalls.master,v 1.78 2005/07/03 20:13:59 drahn Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -621,27 +621,6 @@ /* syscall: "getpeereid" ret: "int" args: "int" "uid_t *" "gid_t *" */ #define SYS_getpeereid 273 -/* syscall: "extattrctl" ret: "int" args: "const char *" "int" "const char *" "int" "const char *" */ -#define SYS_extattrctl 274 - -/* syscall: "extattr_set_file" ret: "int" args: "const char *" "int" "const char *" "const void *" "size_t" */ -#define SYS_extattr_set_file 275 - -/* syscall: "extattr_get_file" ret: "ssize_t" args: "const char *" "int" "const char *" "void *" "size_t" */ -#define SYS_extattr_get_file 276 - -/* syscall: "extattr_delete_file" ret: "int" args: "const char *" "int" "const char *" */ -#define SYS_extattr_delete_file 277 - -/* syscall: "extattr_set_fd" ret: "int" args: "int" "int" "const char *" "const void *" "size_t" */ -#define SYS_extattr_set_fd 278 - -/* syscall: "extattr_get_fd" ret: "ssize_t" args: "int" "int" "const char *" "void *" "size_t" */ -#define SYS_extattr_get_fd 279 - -/* syscall: "extattr_delete_fd" ret: "int" args: "int" "int" "const char *" */ -#define SYS_extattr_delete_fd 280 - /* syscall: "getresuid" ret: "int" args: "uid_t *" "uid_t *" "uid_t *" */ #define SYS_getresuid 281 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index baee7583148..b8519699d95 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.87 2005/06/17 20:42:32 millert Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.88 2005/07/03 20:14:19 drahn Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.77 2005/06/17 20:39:14 millert Exp + * created from; OpenBSD: syscalls.master,v 1.78 2005/07/03 20:13:59 drahn Exp */ #ifdef syscallarg @@ -1123,58 +1123,6 @@ struct sys_getpeereid_args { syscallarg(gid_t *) egid; }; -struct sys_extattrctl_args { - syscallarg(const char *) path; - syscallarg(int) cmd; - syscallarg(const char *) filename; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; -}; - -struct sys_extattr_set_file_args { - syscallarg(const char *) path; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; - syscallarg(const void *) data; - syscallarg(size_t) nbytes; -}; - -struct sys_extattr_get_file_args { - syscallarg(const char *) path; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; - syscallarg(void *) data; - syscallarg(size_t) nbytes; -}; - -struct sys_extattr_delete_file_args { - syscallarg(const char *) path; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; -}; - -struct sys_extattr_set_fd_args { - syscallarg(int) fd; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; - syscallarg(const void *) data; - syscallarg(size_t) nbytes; -}; - -struct sys_extattr_get_fd_args { - syscallarg(int) fd; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; - syscallarg(void *) data; - syscallarg(size_t) nbytes; -}; - -struct sys_extattr_delete_fd_args { - syscallarg(int) fd; - syscallarg(int) attrnamespace; - syscallarg(const char *) attrname; -}; - struct sys_getresuid_args { syscallarg(uid_t *) ruid; syscallarg(uid_t *) euid; @@ -1546,16 +1494,6 @@ int sys_kevent(struct proc *, void *, register_t *); int sys_mlockall(struct proc *, void *, register_t *); int sys_munlockall(struct proc *, void *, register_t *); int sys_getpeereid(struct proc *, void *, register_t *); -#ifdef UFS_EXTATTR -int sys_extattrctl(struct proc *, void *, register_t *); -int sys_extattr_set_file(struct proc *, void *, register_t *); -int sys_extattr_get_file(struct proc *, void *, register_t *); -int sys_extattr_delete_file(struct proc *, void *, register_t *); -int sys_extattr_set_fd(struct proc *, void *, register_t *); -int sys_extattr_get_fd(struct proc *, void *, register_t *); -int sys_extattr_delete_fd(struct proc *, void *, register_t *); -#else -#endif int sys_getresuid(struct proc *, void *, register_t *); int sys_setresuid(struct proc *, void *, register_t *); int sys_getresgid(struct proc *, void *, register_t *); diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h index a20b8a968bf..9934a7fc493 100644 --- a/sys/sys/vnode_if.h +++ b/sys/sys/vnode_if.h @@ -3,7 +3,7 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.27 2005/07/03 01:07:44 jaredy Exp + * OpenBSD: vnode_if.src,v 1.28 2005/07/03 20:14:00 drahn Exp * by the script: * OpenBSD: vnode_if.sh,v 1.14 2005/05/22 21:07:23 pedro Exp */ @@ -380,33 +380,6 @@ struct vop_reallocblks_args { extern struct vnodeop_desc vop_reallocblks_desc; int VOP_REALLOCBLKS(struct vnode *, struct cluster_save *); -struct vop_getextattr_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - int a_attrnamespace; - const char *a_name; - struct uio *a_uio; - size_t *a_size; - struct ucred *a_cred; - struct proc *a_p; -}; -extern struct vnodeop_desc vop_getextattr_desc; -int VOP_GETEXTATTR(struct vnode *, int, const char *, struct uio *, - size_t *, struct ucred *, struct proc *); - -struct vop_setextattr_args { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - int a_attrnamespace; - const char *a_name; - struct uio *a_uio; - struct ucred *a_cred; - struct proc *a_p; -}; -extern struct vnodeop_desc vop_setextattr_desc; -int VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, - struct ucred *, struct proc *); - /* Special cases: */ #include <sys/buf.h> |