Module Name: src
Committed By: bouyer
Date: Wed Feb 9 16:09:55 UTC 2011
Modified Files:
src/sys/compat/netbsd32 [bouyer-quota2]: netbsd32_netbsd.c
syscalls.master
Log Message:
Proper definitions for quotactl
To generate a diff of this commit:
cvs rdiff -u -r1.168.4.1 -r1.168.4.2 \
src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.84.6.1 -r1.84.6.2 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.1 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.2
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.168.4.1 Thu Jan 20 14:24:55 2011
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Wed Feb 9 16:09:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.168.4.1 2011/01/20 14:24:55 bouyer Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.168.4.1 2011/01/20 14:24:55 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1185,7 +1185,7 @@
}
int
-netbsd32_quotactl50(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+compat_50_netbsd32_quotactl(struct lwp *l, const struct compat_50_netbsd32_quotactl_args *uap, register_t *retval)
{
/* {
syscallarg(const netbsd32_charp) path;
@@ -1193,23 +1193,23 @@
syscallarg(int) uid;
syscallarg(netbsd32_voidp) arg;
} */
- struct sys_quotactl_args ua;
+ struct compat_50_sys_quotactl_args ua;
NETBSD32TOP_UAP(path, const char);
NETBSD32TO64_UAP(cmd);
NETBSD32TO64_UAP(uid);
NETBSD32TOP_UAP(arg, void *);
- return (sys_quotactl50(l, &ua, retval));
+ return (compat_50_sys_quotactl(l, &ua, retval));
}
int
-netbsd32_quotactl(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+netbsd32___quotactl50(struct lwp *l, const struct netbsd32___quotactl50_args *uap, register_t *retval)
{
/* {
syscallarg(const netbsd32_charp) path;
syscallarg(void *) v;
} */
- struct sys_quotactl_args ua;
+ //struct sys___quotactl50_args ua;
return EOPNOTSUPP;
#if 0
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.84.6.1 src/sys/compat/netbsd32/syscalls.master:1.84.6.2
--- src/sys/compat/netbsd32/syscalls.master:1.84.6.1 Thu Jan 20 14:24:56 2011
+++ src/sys/compat/netbsd32/syscalls.master Wed Feb 9 16:09:55 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.84.6.1 2011/01/20 14:24:56 bouyer Exp $
+ $NetBSD: syscalls.master,v 1.84.6.2 2011/02/09 16:09:55 bouyer Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -304,7 +304,7 @@
netbsd32_orlimitp_t rlp); }
146 COMPAT_43 { int|netbsd32||killpg(int pgid, int signum); }
147 NOARGS { int|sys||setsid(void); }
-148 COMPAT_50 { int|netbsd32||quotactl50(netbsd32_charp path, int cmd, \
+148 COMPAT_50 { int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
int uid, netbsd32_voidp arg); }
149 COMPAT_43 { int|sys||quota(void); } oquota
150 COMPAT_43 { int|netbsd32||ogetsockname(int fdec, \
@@ -969,5 +969,5 @@
mode_t mode, netbsd32_dev_t dev); }
451 STD { int|netbsd32|50|fhstat(const netbsd32_voidp fhp, \
netbsd32_size_t fh_size, netbsd32_statp_t sb); }
-452 STD { int|sys||quotactl(const char *path, \
+452 STD { int|netbsd32|50|quotactl(const netbsd32_charp path, \
netbsd32_voidp pref); }
