Change mode_t and nlink_t from 16bit to 32bit. This allows us to

use mode_t in syscalls.master and to use mode_t in more places in
the kernel.  It also makes lint much more useful on kernel code.

I've also added a placeholder for st_birthtime to make a UFS2 import
easier at some future date.

Requested by and OK deraadt@

2 files changed, 5 insertions, 25 deletions

diff --git a/sys/compat/netbsd/netbsd_stat.h b/sys/compat/netbsd/netbsd_stat.h
index 582fd451c37..85b8710a786 100644
--- a/sys/compat/netbsd/netbsd_stat.h
+++ b/sys/compat/netbsd/netbsd_stat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_stat.h,v 1.4 2003/06/02 23:28:00 millert Exp $	*/
+/*	$OpenBSD: netbsd_stat.h,v 1.5 2004/07/13 21:04:29 millert Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,26 +36,6 @@
  *	@(#)stat.h	8.12 (Berkeley) 8/17/94
  */
 
-struct netbsd_stat12 {			/* NetBSD-1.2 stat struct */
-	dev_t	  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	u_int16_t st_mode;		/* inode protection mode */
-	u_int16_t st_nlink;		/* number of hard links */
-	uid_t	  st_uid;		/* user ID of the file's owner */
-	gid_t	  st_gid;		/* group ID of the file's group */
-	dev_t	  st_rdev;		/* device type */
-	struct	  timespec st_atimespec;/* time of last access */
-	struct	  timespec st_mtimespec;/* time of last data modification */
-	struct	  timespec st_ctimespec;/* time of last file status change */
-	off_t	  st_size;		/* file size, in bytes */
-	int64_t	  st_blocks;		/* blocks allocated for file */
-	u_int32_t st_blksize;		/* optimal blocksize for I/O */
-	u_int32_t st_flags;		/* user defined flags for file */
-	u_int32_t st_gen;		/* file generation number */
-	int32_t	  st_lspare;
-	int64_t	  st_qspare[2];
-};
-
 /*
  * On systems with 8 byte longs and 4 byte time_ts, padding the time_ts
  * is required in order to have a consistent ABI.  This is because the
diff --git a/sys/compat/netbsd/syscalls.master b/sys/compat/netbsd/syscalls.master
index d0138644513..78d7a886e14 100644
--- a/sys/compat/netbsd/syscalls.master
+++ b/sys/compat/netbsd/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.23 2004/07/09 23:52:02 millert Exp $
+;	$OpenBSD: syscalls.master,v 1.24 2004/07/13 21:04:29 millert Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -396,9 +396,9 @@
 186	UNIMPL
 187	UNIMPL
 #endif
-188	STD		{ int netbsd_sys_stat(char *path, struct stat *ub); }
-189	NOARGS		{ int sys_fstat(int fd, struct stat12 *sb); }
-190	STD		{ int netbsd_sys_lstat(char *path, struct stat *ub); }
+188	STD		{ int netbsd_sys_stat(char *path, struct stat35 *ub); }
+189	NOARGS		{ int sys_fstat(int fd, struct stat35 *sb); }
+190	STD		{ int netbsd_sys_lstat(char *path, struct stat35 *ub); }
 191	STD		{ long netbsd_sys_pathconf(char *path, int name); }
 192	NOARGS		{ long sys_fpathconf(int fd, int name); }
 193	NOARGS		{ int sys_swapctl(int cmd, const void *arg, int misc); }