From owner-svn-soc-all@FreeBSD.ORG Mon Jul 25 06:53:44 2011 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id C5ED6106566B for ; Mon, 25 Jul 2011 06:53:42 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 25 Jul 2011 06:53:42 +0000 Date: Mon, 25 Jul 2011 06:53:42 +0000 From: gk@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20110725065342.C5ED6106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r224526 - in soc2011/gk/ino64-head/sys: compat/freebsd32 kern sys X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2011 06:53:45 -0000 Author: gk Date: Mon Jul 25 06:53:42 2011 New Revision: 224526 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=224526 Log: Regen Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c soc2011/gk/ino64-head/sys/kern/init_sysent.c soc2011/gk/ino64-head/sys/kern/syscalls.c soc2011/gk/ino64-head/sys/kern/systrace_args.c soc2011/gk/ino64-head/sys/sys/syscall.h soc2011/gk/ino64-head/sys/sys/syscall.mk soc2011/gk/ino64-head/sys/sys/sysproto.h Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Mon Jul 25 06:53:42 2011 (r224526) @@ -301,10 +301,10 @@ #define FREEBSD32_SYS_lchflags 391 #define FREEBSD32_SYS_uuidgen 392 #define FREEBSD32_SYS_freebsd32_sendfile 393 -#define FREEBSD32_SYS_getfsstat 395 -#define FREEBSD32_SYS_statfs 396 -#define FREEBSD32_SYS_fstatfs 397 -#define FREEBSD32_SYS_fhstatfs 398 +#define FREEBSD32_SYS_freebsd8_getfsstat 395 +#define FREEBSD32_SYS_freebsd8_statfs 396 +#define FREEBSD32_SYS_freebsd8_fstatfs 397 +#define FREEBSD32_SYS_freebsd8_fhstatfs 398 #define FREEBSD32_SYS_ksem_close 400 #define FREEBSD32_SYS_ksem_post 401 #define FREEBSD32_SYS_ksem_wait 402 @@ -429,4 +429,8 @@ #define FREEBSD32_SYS_freebsd32_fstatat 536 #define FREEBSD32_SYS_getdents 537 #define FREEBSD32_SYS_freebsd32_getdirentries 538 -#define FREEBSD32_SYS_MAXSYSCALL 539 +#define FREEBSD32_SYS_getfsstat 539 +#define FREEBSD32_SYS_statfs 540 +#define FREEBSD32_SYS_fstatfs 541 +#define FREEBSD32_SYS_fhstatfs 542 +#define FREEBSD32_SYS_MAXSYSCALL 543 Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Mon Jul 25 06:53:42 2011 (r224526) @@ -405,10 +405,10 @@ "uuidgen", /* 392 = uuidgen */ "freebsd32_sendfile", /* 393 = freebsd32_sendfile */ "#394", /* 394 = mac_syscall */ - "getfsstat", /* 395 = getfsstat */ - "statfs", /* 396 = statfs */ - "fstatfs", /* 397 = fstatfs */ - "fhstatfs", /* 398 = fhstatfs */ + "compat8.getfsstat", /* 395 = freebsd8 getfsstat */ + "compat8.statfs", /* 396 = freebsd8 statfs */ + "compat8.fstatfs", /* 397 = freebsd8 fstatfs */ + "compat8.fhstatfs", /* 398 = freebsd8 fhstatfs */ "#399", /* 399 = nosys */ "ksem_close", /* 400 = ksem_close */ "ksem_post", /* 401 = ksem_post */ @@ -562,4 +562,8 @@ "freebsd32_fstatat", /* 536 = freebsd32_fstatat */ "getdents", /* 537 = getdents */ "freebsd32_getdirentries", /* 538 = freebsd32_getdirentries */ + "getfsstat", /* 539 = getfsstat */ + "statfs", /* 540 = statfs */ + "fstatfs", /* 541 = fstatfs */ + "fhstatfs", /* 542 = fhstatfs */ }; Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Mon Jul 25 06:53:42 2011 (r224526) @@ -448,10 +448,10 @@ { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 392 = uuidgen */ { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 393 = freebsd32_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 398 = fhstatfs */ + { compat8(AS(freebsd8_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 395 = freebsd8 getfsstat */ + { compat8(AS(freebsd8_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 396 = freebsd8 statfs */ + { compat8(AS(freebsd8_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 397 = freebsd8 fstatfs */ + { compat8(AS(freebsd8_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 398 = freebsd8 fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 399 = nosys */ { AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 400 = ksem_close */ { AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 401 = ksem_post */ @@ -605,4 +605,8 @@ { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 536 = freebsd32_fstatat */ { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 537 = getdents */ { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 538 = freebsd32_getdirentries */ + { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 539 = getfsstat */ + { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 540 = statfs */ + { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 541 = fstatfs */ + { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 542 = fhstatfs */ }; Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c Mon Jul 25 06:53:42 2011 (r224526) @@ -1846,39 +1846,6 @@ *n_args = 8; break; } - /* getfsstat */ - case 395: { - struct getfsstat_args *p = params; - uarg[0] = (intptr_t) p->buf; /* struct statfs * */ - iarg[1] = p->bufsize; /* long */ - iarg[2] = p->flags; /* int */ - *n_args = 3; - break; - } - /* statfs */ - case 396: { - struct statfs_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } - /* fstatfs */ - case 397: { - struct fstatfs_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } - /* fhstatfs */ - case 398: { - struct fhstatfs_args *p = params; - uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } /* ksem_close */ case 400: { struct ksem_close_args *p = params; @@ -2994,6 +2961,39 @@ *n_args = 4; break; } + /* getfsstat */ + case 539: { + struct getfsstat_args *p = params; + uarg[0] = (intptr_t) p->buf; /* struct statfs * */ + iarg[1] = p->bufsize; /* long */ + iarg[2] = p->flags; /* int */ + *n_args = 3; + break; + } + /* statfs */ + case 540: { + struct statfs_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } + /* fstatfs */ + case 541: { + struct fstatfs_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } + /* fhstatfs */ + case 542: { + struct fhstatfs_args *p = params; + uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -5954,61 +5954,6 @@ break; }; break; - /* getfsstat */ - case 395: - switch(ndx) { - case 0: - p = "struct statfs *"; - break; - case 1: - p = "long"; - break; - case 2: - p = "int"; - break; - default: - break; - }; - break; - /* statfs */ - case 396: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; - /* fstatfs */ - case 397: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; - /* fhstatfs */ - case 398: - switch(ndx) { - case 0: - p = "const struct fhandle *"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; /* ksem_close */ case 400: switch(ndx) { @@ -7988,6 +7933,61 @@ break; }; break; + /* getfsstat */ + case 539: + switch(ndx) { + case 0: + p = "struct statfs *"; + break; + case 1: + p = "long"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* statfs */ + case 540: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; + /* fstatfs */ + case 541: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; + /* fhstatfs */ + case 542: + switch(ndx) { + case 0: + p = "const struct fhandle *"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; default: break; }; Modified: soc2011/gk/ino64-head/sys/kern/init_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/init_sysent.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/kern/init_sysent.c Mon Jul 25 06:53:42 2011 (r224526) @@ -435,10 +435,10 @@ { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 392 = uuidgen */ { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 393 = sendfile */ { AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 398 = fhstatfs */ + { compat8(AS(freebsd8_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 395 = freebsd8 getfsstat */ + { compat8(AS(freebsd8_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 396 = freebsd8 statfs */ + { compat8(AS(freebsd8_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 397 = freebsd8 fstatfs */ + { compat8(AS(freebsd8_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 398 = freebsd8 fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 399 = nosys */ { AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 400 = ksem_close */ { AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 401 = ksem_post */ @@ -579,4 +579,8 @@ { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 536 = fstatat */ { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 537 = getdents */ { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 538 = getdirentries */ + { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 539 = getfsstat */ + { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 540 = statfs */ + { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 541 = fstatfs */ + { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 542 = fhstatfs */ }; Modified: soc2011/gk/ino64-head/sys/kern/syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/syscalls.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/kern/syscalls.c Mon Jul 25 06:53:42 2011 (r224526) @@ -402,10 +402,10 @@ "uuidgen", /* 392 = uuidgen */ "sendfile", /* 393 = sendfile */ "mac_syscall", /* 394 = mac_syscall */ - "getfsstat", /* 395 = getfsstat */ - "statfs", /* 396 = statfs */ - "fstatfs", /* 397 = fstatfs */ - "fhstatfs", /* 398 = fhstatfs */ + "compat8.getfsstat", /* 395 = freebsd8 getfsstat */ + "compat8.statfs", /* 396 = freebsd8 statfs */ + "compat8.fstatfs", /* 397 = freebsd8 fstatfs */ + "compat8.fhstatfs", /* 398 = freebsd8 fhstatfs */ "#399", /* 399 = nosys */ "ksem_close", /* 400 = ksem_close */ "ksem_post", /* 401 = ksem_post */ @@ -546,4 +546,8 @@ "fstatat", /* 536 = fstatat */ "getdents", /* 537 = getdents */ "getdirentries", /* 538 = getdirentries */ + "getfsstat", /* 539 = getfsstat */ + "statfs", /* 540 = statfs */ + "fstatfs", /* 541 = fstatfs */ + "fhstatfs", /* 542 = fhstatfs */ }; Modified: soc2011/gk/ino64-head/sys/kern/systrace_args.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/systrace_args.c Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/kern/systrace_args.c Mon Jul 25 06:53:42 2011 (r224526) @@ -2063,39 +2063,6 @@ *n_args = 3; break; } - /* getfsstat */ - case 395: { - struct getfsstat_args *p = params; - uarg[0] = (intptr_t) p->buf; /* struct statfs * */ - iarg[1] = p->bufsize; /* long */ - iarg[2] = p->flags; /* int */ - *n_args = 3; - break; - } - /* statfs */ - case 396: { - struct statfs_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } - /* fstatfs */ - case 397: { - struct fstatfs_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } - /* fhstatfs */ - case 398: { - struct fhstatfs_args *p = params; - uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ - uarg[1] = (intptr_t) p->buf; /* struct statfs * */ - *n_args = 2; - break; - } /* ksem_close */ case 400: { struct ksem_close_args *p = params; @@ -3170,6 +3137,39 @@ *n_args = 4; break; } + /* getfsstat */ + case 539: { + struct getfsstat_args *p = params; + uarg[0] = (intptr_t) p->buf; /* struct statfs * */ + iarg[1] = p->bufsize; /* long */ + iarg[2] = p->flags; /* int */ + *n_args = 3; + break; + } + /* statfs */ + case 540: { + struct statfs_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } + /* fstatfs */ + case 541: { + struct fstatfs_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } + /* fhstatfs */ + case 542: { + struct fhstatfs_args *p = params; + uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ + uarg[1] = (intptr_t) p->buf; /* struct statfs * */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -6512,61 +6512,6 @@ break; }; break; - /* getfsstat */ - case 395: - switch(ndx) { - case 0: - p = "struct statfs *"; - break; - case 1: - p = "long"; - break; - case 2: - p = "int"; - break; - default: - break; - }; - break; - /* statfs */ - case 396: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; - /* fstatfs */ - case 397: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; - /* fhstatfs */ - case 398: - switch(ndx) { - case 0: - p = "const struct fhandle *"; - break; - case 1: - p = "struct statfs *"; - break; - default: - break; - }; - break; /* ksem_close */ case 400: switch(ndx) { @@ -8435,6 +8380,61 @@ break; }; break; + /* getfsstat */ + case 539: + switch(ndx) { + case 0: + p = "struct statfs *"; + break; + case 1: + p = "long"; + break; + case 2: + p = "int"; + break; + default: + break; + }; + break; + /* statfs */ + case 540: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; + /* fstatfs */ + case 541: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; + /* fhstatfs */ + case 542: + switch(ndx) { + case 0: + p = "const struct fhandle *"; + break; + case 1: + p = "struct statfs *"; + break; + default: + break; + }; + break; default: break; }; Modified: soc2011/gk/ino64-head/sys/sys/syscall.h ============================================================================== --- soc2011/gk/ino64-head/sys/sys/syscall.h Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/sys/syscall.h Mon Jul 25 06:53:42 2011 (r224526) @@ -320,10 +320,10 @@ #define SYS_uuidgen 392 #define SYS_sendfile 393 #define SYS_mac_syscall 394 -#define SYS_getfsstat 395 -#define SYS_statfs 396 -#define SYS_fstatfs 397 -#define SYS_fhstatfs 398 +#define SYS_freebsd8_getfsstat 395 +#define SYS_freebsd8_statfs 396 +#define SYS_freebsd8_fstatfs 397 +#define SYS_freebsd8_fhstatfs 398 #define SYS_ksem_close 400 #define SYS_ksem_post 401 #define SYS_ksem_wait 402 @@ -448,4 +448,8 @@ #define SYS_fstatat 536 #define SYS_getdents 537 #define SYS_getdirentries 538 -#define SYS_MAXSYSCALL 539 +#define SYS_getfsstat 539 +#define SYS_statfs 540 +#define SYS_fstatfs 541 +#define SYS_fhstatfs 542 +#define SYS_MAXSYSCALL 543 Modified: soc2011/gk/ino64-head/sys/sys/syscall.mk ============================================================================== --- soc2011/gk/ino64-head/sys/sys/syscall.mk Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/sys/syscall.mk Mon Jul 25 06:53:42 2011 (r224526) @@ -269,10 +269,10 @@ uuidgen.o \ sendfile.o \ mac_syscall.o \ - getfsstat.o \ - statfs.o \ - fstatfs.o \ - fhstatfs.o \ + freebsd8_getfsstat.o \ + freebsd8_statfs.o \ + freebsd8_fstatfs.o \ + freebsd8_fhstatfs.o \ ksem_close.o \ ksem_post.o \ ksem_wait.o \ @@ -396,4 +396,8 @@ fhstat.o \ fstatat.o \ getdents.o \ - getdirentries.o + getdirentries.o \ + getfsstat.o \ + statfs.o \ + fstatfs.o \ + fhstatfs.o Modified: soc2011/gk/ino64-head/sys/sys/sysproto.h ============================================================================== --- soc2011/gk/ino64-head/sys/sys/sysproto.h Mon Jul 25 06:53:25 2011 (r224525) +++ soc2011/gk/ino64-head/sys/sys/sysproto.h Mon Jul 25 06:53:42 2011 (r224526) @@ -1100,23 +1100,6 @@ char call_l_[PADL_(int)]; int call; char call_r_[PADR_(int)]; char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)]; }; -struct getfsstat_args { - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; - char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct statfs_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; -}; -struct fstatfs_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; -}; -struct fhstatfs_args { - char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; -}; struct ksem_close_args { char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)]; }; @@ -1701,6 +1684,23 @@ char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; char basep_l_[PADL_(long *)]; long * basep; char basep_r_[PADR_(long *)]; }; +struct getfsstat_args { + char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; + char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; +struct statfs_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; +}; +struct fstatfs_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; +}; +struct fhstatfs_args { + char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; + char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1942,10 +1942,6 @@ int uuidgen(struct thread *, struct uuidgen_args *); int sendfile(struct thread *, struct sendfile_args *); int mac_syscall(struct thread *, struct mac_syscall_args *); -int getfsstat(struct thread *, struct getfsstat_args *); -int statfs(struct thread *, struct statfs_args *); -int fstatfs(struct thread *, struct fstatfs_args *); -int fhstatfs(struct thread *, struct fhstatfs_args *); int ksem_close(struct thread *, struct ksem_close_args *); int ksem_post(struct thread *, struct ksem_post_args *); int ksem_wait(struct thread *, struct ksem_wait_args *); @@ -2069,6 +2065,10 @@ int fstatat(struct thread *, struct fstatat_args *); int getdents(struct thread *, struct getdents_args *); int getdirentries(struct thread *, struct getdirentries_args *); +int getfsstat(struct thread *, struct getfsstat_args *); +int statfs(struct thread *, struct statfs_args *); +int fstatfs(struct thread *, struct fstatfs_args *); +int fhstatfs(struct thread *, struct fhstatfs_args *); #ifdef COMPAT_43 @@ -2375,6 +2375,23 @@ char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; char sb_l_[PADL_(struct freebsd8_stat *)]; struct freebsd8_stat * sb; char sb_r_[PADR_(struct freebsd8_stat *)]; }; +struct freebsd8_getfsstat_args { + char buf_l_[PADL_(struct freebsd8_statfs *)]; struct freebsd8_statfs * buf; char buf_r_[PADR_(struct freebsd8_statfs *)]; + char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; +struct freebsd8_statfs_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct freebsd8_statfs *)]; struct freebsd8_statfs * buf; char buf_r_[PADR_(struct freebsd8_statfs *)]; +}; +struct freebsd8_fstatfs_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(struct freebsd8_statfs *)]; struct freebsd8_statfs * buf; char buf_r_[PADR_(struct freebsd8_statfs *)]; +}; +struct freebsd8_fhstatfs_args { + char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; + char buf_l_[PADL_(struct freebsd8_statfs *)]; struct freebsd8_statfs * buf; char buf_r_[PADR_(struct freebsd8_statfs *)]; +}; struct freebsd8_fstatat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; @@ -2390,6 +2407,10 @@ int freebsd8_nfstat(struct thread *, struct freebsd8_nfstat_args *); int freebsd8_nlstat(struct thread *, struct freebsd8_nlstat_args *); int freebsd8_fhstat(struct thread *, struct freebsd8_fhstat_args *); +int freebsd8_getfsstat(struct thread *, struct freebsd8_getfsstat_args *); +int freebsd8_statfs(struct thread *, struct freebsd8_statfs_args *); +int freebsd8_fstatfs(struct thread *, struct freebsd8_fstatfs_args *); +int freebsd8_fhstatfs(struct thread *, struct freebsd8_fhstatfs_args *); int freebsd8_fstatat(struct thread *, struct freebsd8_fstatat_args *); #endif /* COMPAT_FREEBSD8 */ @@ -2694,10 +2715,10 @@ #define SYS_AUE_uuidgen AUE_NULL #define SYS_AUE_sendfile AUE_SENDFILE #define SYS_AUE_mac_syscall AUE_NULL -#define SYS_AUE_getfsstat AUE_GETFSSTAT -#define SYS_AUE_statfs AUE_STATFS -#define SYS_AUE_fstatfs AUE_FSTATFS -#define SYS_AUE_fhstatfs AUE_FHSTATFS +#define SYS_AUE_freebsd8_getfsstat AUE_GETFSSTAT +#define SYS_AUE_freebsd8_statfs AUE_STATFS +#define SYS_AUE_freebsd8_fstatfs AUE_FSTATFS +#define SYS_AUE_freebsd8_fhstatfs AUE_FHSTATFS #define SYS_AUE_ksem_close AUE_NULL #define SYS_AUE_ksem_post AUE_NULL #define SYS_AUE_ksem_wait AUE_NULL @@ -2822,6 +2843,10 @@ #define SYS_AUE_fstatat AUE_FSTATAT #define SYS_AUE_getdents AUE_O_GETDENTS #define SYS_AUE_getdirentries AUE_GETDIRENTRIES +#define SYS_AUE_getfsstat AUE_GETFSSTAT +#define SYS_AUE_statfs AUE_STATFS +#define SYS_AUE_fstatfs AUE_FSTATFS +#define SYS_AUE_fhstatfs AUE_FHSTATFS #undef PAD_ #undef PADL_