Module Name: src
Committed By: justin
Date: Wed Apr 8 13:31:42 UTC 2015
Modified Files:
src/sys/rump: rump.sysmap
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
src/sys/sys: syscallargs.h
Log Message:
regen after syscall update
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/rump.sysmap
cvs rdiff -u -r1.82 -r1.83 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.107 -r1.108 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
cvs rdiff -u -r1.260 -r1.261 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/rump.sysmap
diff -u src/sys/rump/rump.sysmap:1.2 src/sys/rump/rump.sysmap:1.3
--- src/sys/rump/rump.sysmap:1.2 Fri Jul 25 08:27:36 2014
+++ src/sys/rump/rump.sysmap Wed Apr 8 13:31:42 2015
@@ -100,6 +100,7 @@
254 sys_nomodule _ksem_getvalue rump___sysimpl__ksem_getvalue
255 sys_nomodule _ksem_destroy rump___sysimpl__ksem_destroy
256 sys_nomodule _ksem_timedwait rump___sysimpl__ksem_timedwait
+270 sys___posix_rename __posix_rename rump___sysimpl___posix_rename
274 sys_lchmod lchmod rump___sysimpl_lchmod
275 sys_lchown lchown rump___sysimpl_lchown
276 sys_nomodule lutimes rump___sysimpl_lutimes
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.82 src/sys/rump/include/rump/rump_syscalls.h:1.83
--- src/sys/rump/include/rump/rump_syscalls.h:1.82 Sat Mar 7 16:40:05 2015
+++ src/sys/rump/include/rump/rump_syscalls.h Wed Apr 8 13:31:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.h,v 1.82 2015/03/07 16:40:05 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.83 2015/04/08 13:31:42 justin Exp $ */
/*
* System call protos in rump namespace.
@@ -108,6 +108,10 @@
#define RUMP_SYS_RENAME_AIO_CANCEL rump___sysimpl_aio_cancel
#endif
+#ifndef RUMP_SYS_RENAME___POSIX_RENAME
+#define RUMP_SYS_RENAME___POSIX_RENAME rump___sysimpl___posix_rename
+#endif
+
#ifndef RUMP_SYS_RENAME_LISTXATTR
#define RUMP_SYS_RENAME_LISTXATTR rump___sysimpl_listxattr
#endif
@@ -937,6 +941,7 @@ int rump_sys__ksem_trywait(intptr_t) __R
int rump_sys__ksem_getvalue(intptr_t, unsigned int *) __RENAME(RUMP_SYS_RENAME__KSEM_GETVALUE);
int rump_sys__ksem_destroy(intptr_t) __RENAME(RUMP_SYS_RENAME__KSEM_DESTROY);
int rump_sys__ksem_timedwait(intptr_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME__KSEM_TIMEDWAIT);
+int rump_sys___posix_rename(const char *, const char *) __RENAME(RUMP_SYS_RENAME___POSIX_RENAME);
int rump_sys_lchmod(const char *, mode_t) __RENAME(RUMP_SYS_RENAME_LCHMOD);
int rump_sys_lchown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_LCHOWN);
int rump_sys_lutimes(const char *, const struct timeval *) __RENAME(RUMP_SYS_RENAME_LUTIMES);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.107 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.108
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.107 Sun Mar 8 20:32:21 2015
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed Apr 8 13:31:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.107 2015/03/08 20:32:21 christos Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.108 2015/04/08 13:31:42 justin Exp $ */
/*
* System call vector and marshalling for rump.
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.107 2015/03/08 20:32:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.108 2015/04/08 13:31:42 justin Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -2954,6 +2954,35 @@ __weak_alias(__ksem_timedwait,rump___sys
__strong_alias(_sys__ksem_timedwait,rump___sysimpl__ksem_timedwait);
#endif /* RUMP_KERNEL_IS_LIBC */
+int rump___sysimpl___posix_rename(const char *, const char *);
+int
+rump___sysimpl___posix_rename(const char * from, const char * to)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___posix_rename_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, from) = from;
+ SPARG(&callarg, to) = to;
+
+ error = rsys_syscall(SYS___posix_rename, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(__posix_rename,rump___sysimpl___posix_rename);
+__weak_alias(___posix_rename,rump___sysimpl___posix_rename);
+__strong_alias(_sys___posix_rename,rump___sysimpl___posix_rename);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
int rump___sysimpl_lchmod(const char *, mode_t);
int
rump___sysimpl_lchmod(const char * path, mode_t mode)
@@ -7519,8 +7548,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 269 = filler */
{
+ ns(struct sys___posix_rename_args),
.sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 270 = __posix_rename */
+ }, /* 270 = __posix_rename */
{
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 271 = swapctl */
Index: src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
diff -u src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.2 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.3
--- src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.2 Sun Apr 27 16:30:09 2014
+++ src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Wed Apr 8 13:31:42 2015
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpvfs_syscalls.c,v 1.2 2014/04/27 16:30:09 pooka Exp $ */
+/* $NetBSD: rumpvfs_syscalls.c,v 1.3 2015/04/08 13:31:42 justin Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.2 2014/04/27 16:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.3 2015/04/08 13:31:42 justin Exp $");
#include <sys/param.h>
@@ -41,6 +41,7 @@ extern sy_call_t sys_lseek;
extern sy_call_t sys_truncate;
extern sy_call_t sys_ftruncate;
extern sy_call_t sys_fdatasync;
+extern sy_call_t sys___posix_rename;
extern sy_call_t sys_lchmod;
extern sy_call_t sys_lchown;
extern sy_call_t sys_preadv;
@@ -105,6 +106,8 @@ extern sy_call_t sys_symlinkat;
extern sy_call_t sys_unlinkat;
extern sy_call_t sys_futimens;
extern sy_call_t sys___quotactl;
+extern sy_call_t sys_posix_fallocate;
+extern sy_call_t sys_fdiscard;
static const struct rump_onesyscall mysys[] = {
{ 5, sys_open },
@@ -139,6 +142,7 @@ static const struct rump_onesyscall mysy
{ 200, sys_truncate },
{ 201, sys_ftruncate },
{ 241, sys_fdatasync },
+ { 270, sys___posix_rename },
{ 274, sys_lchmod },
{ 275, sys_lchown },
{ 289, sys_preadv },
@@ -203,6 +207,8 @@ static const struct rump_onesyscall mysy
{ 471, sys_unlinkat },
{ 472, sys_futimens },
{ 473, sys___quotactl },
+ { 479, sys_posix_fallocate },
+ { 480, sys_fdiscard },
};
RUMP_COMPONENT(RUMP_COMPONENT_SYSCALL)
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.260 src/sys/sys/syscallargs.h:1.261
--- src/sys/sys/syscallargs.h:1.260 Sat Mar 7 16:39:20 2015
+++ src/sys/sys/syscallargs.h Wed Apr 8 13:31:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: syscallargs.h,v 1.260 2015/03/07 16:39:20 christos Exp $ */
+/* $NetBSD: syscallargs.h,v 1.261 2015/04/08 13:31:42 justin Exp $ */
/*
* System call argument lists.
@@ -1681,13 +1681,11 @@ struct compat_50_sys_mq_timedreceive_arg
check_syscall_args(compat_50_sys_mq_timedreceive)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___posix_rename_args {
syscallarg(const char *) from;
syscallarg(const char *) to;
};
check_syscall_args(sys___posix_rename)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct sys_swapctl_args {
