socsvn commit: r223368 - in soc2011/gk/ino64-head/sys: kern sys

[gk at FreeBSD.org]

Author: gk
Date: Fri Jun 17 22:29:18 2011
New Revision: 223368
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223368

Log:
  Use ino_t and nlink_t in struct vattr

Modified:
  soc2011/gk/ino64-head/sys/kern/vfs_subr.c
  soc2011/gk/ino64-head/sys/sys/vnode.h

Modified: soc2011/gk/ino64-head/sys/kern/vfs_subr.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/vfs_subr.c	Fri Jun 17 22:29:07 2011	(r223367)
+++ soc2011/gk/ino64-head/sys/kern/vfs_subr.c	Fri Jun 17 22:29:18 2011	(r223368)
@@ -94,6 +94,8 @@
 #include <ddb/ddb.h>
 #endif
 
+CTASSERT(sizeof(struct vattr) % sizeof(quad_t) == 0);
+
 #define	WI_MPSAFEQ	0
 #define	WI_GIANTQ	1
 

Modified: soc2011/gk/ino64-head/sys/sys/vnode.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/vnode.h	Fri Jun 17 22:29:07 2011	(r223367)
+++ soc2011/gk/ino64-head/sys/sys/vnode.h	Fri Jun 17 22:29:18 2011	(r223368)
@@ -259,11 +259,11 @@
 struct vattr {
 	enum vtype	va_type;	/* vnode type (for create) */
 	u_short		va_mode;	/* files access mode and type */
-	short		va_nlink;	/* number of references to file */
+	nlink_t		va_nlink;	/* number of references to file */
 	uid_t		va_uid;		/* owner user id */
 	gid_t		va_gid;		/* owner group id */
 	dev_t		va_fsid;	/* filesystem id */
-	long		va_fileid;	/* file id */
+	ino_t		va_fileid;	/* file id */
 	u_quad_t	va_size;	/* file size in bytes */
 	long		va_blocksize;	/* blocksize preferred for i/o */
 	struct timespec	va_atime;	/* time of last access */