From fa7d4218c7038cb4bd29cbdf693306118b324030 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 18 Jul 2019 19:07:32 -0400 Subject: remove mips/n32/64 stat struct hacks from syscall machinery now that we have a kstat structure decoupled from the public struct stat, we can just use the broken kernel structures directly and let the code in fstatat do the translation. --- arch/mips/syscall_arch.h | 46 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) (limited to 'arch/mips/syscall_arch.h') diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h index 43bcdee7..e4854f50 100644 --- a/arch/mips/syscall_arch.h +++ b/arch/mips/syscall_arch.h @@ -5,18 +5,6 @@ #define SYSCALL_RLIM_INFINITY (-1UL/2) -#if _MIPSEL || __MIPSEL || __MIPSEL__ -#define __stat_fix(st) ((st),(void)0) -#else -#include -static inline void __stat_fix(long p) -{ - struct stat *st = (struct stat *)p; - st->st_dev >>= 32; - st->st_rdev >>= 32; -} -#endif - static inline long __syscall0(long n) { register long r7 __asm__("$7"); @@ -55,10 +43,7 @@ static inline long __syscall2(long n, long a, long b) "r"(r4), "r"(r5) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall3(long n, long a, long b, long c) @@ -74,10 +59,7 @@ static inline long __syscall3(long n, long a, long b, long c) "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall4(long n, long a, long b, long c, long d) @@ -93,11 +75,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d) "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall5(long n, long a, long b, long c, long d, long e) @@ -116,11 +94,7 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f) @@ -140,11 +114,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } static inline long __syscall7(long n, long a, long b, long c, long d, long e, long f, long g) @@ -165,11 +135,7 @@ static inline long __syscall7(long n, long a, long b, long c, long d, long e, lo : "ir"(n), "0"(r2), "1"(r7), "r"(r4), "r"(r5), "r"(r6) : "$1", "$3", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory"); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); - if (n == SYS_fstatat64) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } #define VDSO_USEFUL -- cgit v1.2.1