Module Name:    src
Committed By:   pooka
Date:           Thu Mar 21 15:03:47 UTC 2013

Modified Files:
        src/sys/compat/linux/arch/arm: linux_types.h

Log Message:
Fix stat64 by making it match i386.  Other archs might still be broken,
but this is the one I could test.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/arm/linux_types.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/compat/linux/arch/arm/linux_types.h
diff -u src/sys/compat/linux/arch/arm/linux_types.h:1.8 src/sys/compat/linux/arch/arm/linux_types.h:1.9
--- src/sys/compat/linux/arch/arm/linux_types.h:1.8	Sun Jan 11 02:45:48 2009
+++ src/sys/compat/linux/arch/arm/linux_types.h	Thu Mar 21 15:03:47 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_types.h,v 1.8 2009/01/11 02:45:48 christos Exp $	*/
+/*	$NetBSD: linux_types.h,v 1.9 2013/03/21 15:03:47 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -76,34 +76,33 @@ struct linux_stat {
  * insane amounts of padding around dev_t's.
  */
 struct linux_stat64 {
-	unsigned short	lst_dev;
-	unsigned char	__pad0[10];
+	unsigned long long lst_dev;
+	unsigned int	__pad1;
 
 #define LINUX_STAT64_HAS_BROKEN_ST_INO	1
-	unsigned long	__lst_ino;
+	unsigned int	__lst_ino;
 	unsigned int	lst_mode;
 	unsigned int	lst_nlink;
 
-	unsigned long	lst_uid;
-	unsigned long	lst_gid;
+	unsigned int	lst_uid;
+	unsigned int	lst_gid;
 
-	unsigned short	lst_rdev;
-	unsigned char	__pad3[10];
+	unsigned long long	lst_rdev;
+	unsigned int	__pad2;
 
 	long long	lst_size;
-	unsigned long	lst_blksize;
+	unsigned int	lst_blksize;
 
-	unsigned long	lst_blocks;	/* Number 512-byte blocks allocated. */
-	unsigned long	__pad4;		/* future possible st_blocks high bits*/
+	unsigned long long lst_blocks;	/* Number 512-byte blocks allocated. */
 
-	unsigned long	lst_atime;
-	unsigned long	__pad5;
+	unsigned int	lst_atime;
+	unsigned int	lst_atime_nsec;
 
-	unsigned long	lst_mtime;
-	unsigned long	__pad6;
+	unsigned int	lst_mtime;
+	unsigned int	lst_mtime_nsec;
 
-	unsigned long	lst_ctime;
-	unsigned long	__pad7;		/* will be high 32 bits of ctime someday */
+	unsigned int	lst_ctime;
+	unsigned int	lst_ctime_nsec;
 
 	unsigned long long lst_ino;
 };

Reply via email to