sync

3 files changed, 5 insertions, 106 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
 };