LU-433 ldiskfs: remove jbd2-jcberr patch from kernel

[fs/lustre-release.git] / libsysio / include / native.h

diff --git a/libsysio/include/native.h b/libsysio/include/native.h
index 1409817..0aeab3c 100644 (file)
--- a/libsysio/include/native.h
+++ b/libsysio/include/native.h
@@ -87,7 +87,7 @@ do {                                            \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_flags   = (src)->st_flags;   \
        (dest)->st_gen     = (src)->st_gen;     \
-} while (0);
+} while (0)
 
 #else 
 #define _sysio_native_stat intnl_stat
@@ -97,22 +97,22 @@ do {                                            \
 /*
  * System calls.
  */
-#if _LARGEFILE64_SOURCE && defined(SYS_lstat64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_lstat64)
 #define SYSIO_SYS_stat         SYS_lstat64
 #elif defined(SYS_lstat)
 #define SYSIO_SYS_stat         SYS_lstat
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_fstat64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_fstat64)
 #define SYSIO_SYS_fstat                SYS_fstat64
 #elif defined(SYS_fstat)
 #define SYSIO_SYS_fstat                SYS_fstat
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_truncate64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_truncate64)
 #define SYSIO_SYS_truncate     SYS_truncate64
 #elif defined(SYS_truncate)
 #define SYSIO_SYS_truncate     SYS_truncate
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_ftruncate64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_ftruncate64)
 #define SYSIO_SYS_ftruncate    SYS_ftruncate64
 #elif defined(SYS_ftruncate)
 #define SYSIO_SYS_ftruncate    SYS_ftruncate
@@ -123,13 +123,17 @@ do {                                            \
 #if defined(SYS_close)
 #define SYSIO_SYS_close                SYS_close
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_lseek64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_lseek64)
 #define SYSIO_SYS_lseek                SYS_lseek64
 #elif defined(SYS_lseek)
 #define SYSIO_SYS_lseek                SYS_lseek
 #endif
 #if defined(SYS__llseek)
-#define SYSIO_SYS__llseek      SYS__llseek
+# if defined (__mips64__)
+#  define SYSIO_SYS__llseek     SYS_O32__llseek
+# else
+#  define SYSIO_SYS__llseek     SYS__llseek
+# endif
 #endif
 #if defined(SYS_read)
 #define SYSIO_SYS_read         SYS_read
@@ -143,17 +147,17 @@ do {                                            \
 #if defined(SYS_writev)
 #define SYSIO_SYS_writev       SYS_writev
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_pread64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_pread64)
 #define SYSIO_SYS_pread                SYS_pread64
 #elif defined(SYS_pread)
 #define SYSIO_SYS_pread                SYS_pread
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_pwrite64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_pwrite64)
 #define SYSIO_SYS_pwrite       SYS_pwrite64
 #elif defined(SYS_pwrite)
 #define SYSIO_SYS_pwrite       SYS_pwrite
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_fcntl64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_fcntl64)
 #define SYSIO_SYS_fcntl                SYS_fcntl64
 #elif defined(SYS_fcntl)
 #define SYSIO_SYS_fcntl                SYS_fcntl
@@ -161,7 +165,7 @@ do {                                            \
 #if defined(SYS_fsync)
 #define SYSIO_SYS_fsync                SYS_fsync
 #endif
-#if ALPHA_LINUX && defined(SYS_osf_fdatasync)
+#if defined(ALPHA_LINUX) && defined(SYS_osf_fdatasync)
 #define SYSIO_SYS_fdatasync    SYS_osf_fdatasync
 #elif defined(SYS_fdatasync)
 #define SYSIO_SYS_fdatasync    SYS_fdatasync
@@ -188,16 +192,20 @@ do {                                            \
 #define SYSIO_SYS_rmdir                SYS_rmdir
 #endif
 #if defined(SYS_getdirentries)
-#if _LARGEFILE64_SOURCE && defined(SYS_getdirentries64)
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_getdirentries64)
 #define SYSIO_SYS_getdirentries        SYS_getdirentries64
 #elif defined(SYS_getdirentries)
 #define SYSIO_SYS_getdirentries        SYS_getdirentries
 #endif
 #endif
-#if _LARGEFILE64_SOURCE && defined(SYS_getdents64)
-#define SYSIO_SYS_getdents64   SYS_getdents64
+#if defined(_LARGEFILE64_SOURCE) && defined(SYS_getdents64)
+# define SYSIO_SYS_getdents64  SYS_getdents64
 #elif defined(SYS_getdents)
-#define SYSIO_SYS_getdents     SYS_getdents
+# if defined (__mips64__)
+#  define SYSIO_SYS_getdents64  SYS_getdents
+# else
+#  define SYSIO_SYS_getdents    SYS_getdents
+# endif
 #endif
 #if defined(SYS_link)
 #define SYSIO_SYS_link         SYS_link
@@ -221,7 +229,11 @@ do {                                            \
 #define SYSIO_SYS_utime                SYS_utime
 #endif
 #if defined(SYS_socketcall)
-#define SYSIO_SYS_socketcall   SYS_socketcall
+# if defined (__mips64__)
+#  define SYSIO_SYS_socketcall  SYS_O32_socketcall
+# else
+#  define SYSIO_SYS_socketcall  SYS_socketcall
+# endif
 #endif
 #if defined(SYS_socket)
 #define SYSIO_SYS_socket       SYS_socket