diff options
| author | Rich Felker <dalias@aerifal.cx> | 2019-07-18 19:07:32 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2019-07-18 19:38:37 -0400 |
| commit | fa7d4218c7038cb4bd29cbdf693306118b324030 (patch) | |
| tree | 768d3898a9ec703ee09f426eb0fa33776b83b843 /arch/mipsn32 | |
| parent | 01ae3fc6d48f4a45535189b7a6db286535af08ca (diff) | |
| download | musl-fa7d4218c7038cb4bd29cbdf693306118b324030.tar.gz musl-fa7d4218c7038cb4bd29cbdf693306118b324030.tar.xz musl-fa7d4218c7038cb4bd29cbdf693306118b324030.zip | |
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.
Diffstat (limited to 'arch/mipsn32')
| -rw-r--r-- | arch/mipsn32/kstat.h | 8 | ||||
| -rw-r--r-- | arch/mipsn32/syscall_arch.h | 36 |
2 files changed, 9 insertions, 35 deletions
diff --git a/arch/mipsn32/kstat.h b/arch/mipsn32/kstat.h index 7be515c8..3841559c 100644 --- a/arch/mipsn32/kstat.h +++ b/arch/mipsn32/kstat.h @@ -1,13 +1,13 @@ struct kstat { - dev_t st_dev; - long __pad1[2]; + unsigned st_dev; + long __pad1[3]; ino_t st_ino; mode_t st_mode; nlink_t st_nlink; uid_t st_uid; gid_t st_gid; - dev_t st_rdev; - long __pad2[2]; + unsigned st_rdev; + long __pad2[3]; off_t st_size; long st_atime_sec; long st_atime_nsec; diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h index 894c033d..78b217fa 100644 --- a/arch/mipsn32/syscall_arch.h +++ b/arch/mipsn32/syscall_arch.h @@ -3,18 +3,6 @@ #define SYSCALL_RLIM_INFINITY (-1UL/2) -#if _MIPSEL || __MIPSEL || __MIPSEL__ -#define __stat_fix(st) ((st),(void)0) -#else -#include <sys/stat.h> -static inline void __stat_fix(long p) -{ - struct stat *st = (struct stat *)p; - st->st_dev >>= 32; - st->st_rdev >>= 32; -} -#endif - #define SYSCALL_CLOBBERLIST \ "$1", "$3", "$10", "$11", "$12", "$13", \ "$14", "$15", "$24", "$25", "hi", "lo", "memory" @@ -55,10 +43,7 @@ static inline long __syscall2(long n, long a, long b) : "+&r"(r2), "=r"(r7) : "r"(r4), "r"(r5) : SYSCALL_CLOBBERLIST); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall3(long n, long a, long b, long c) @@ -73,10 +58,7 @@ static inline long __syscall3(long n, long a, long b, long c) : "+&r"(r2), "=r"(r7) : "r"(r4), "r"(r5), "r"(r6) : SYSCALL_CLOBBERLIST); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); - return ret; + return r7 ? -r2 : r2; } static inline long __syscall4(long n, long a, long b, long c, long d) @@ -91,11 +73,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d) : "+&r"(r2), "+r"(r7) : "r"(r4), "r"(r5), "r"(r6) : SYSCALL_CLOBBERLIST); - if (r7) return -r2; - long ret = r2; - if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); - if (n == SYS_newfstatat) __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) @@ -111,9 +89,7 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) : "+&r"(r2), "+r"(r7) : "r"(r4), "r"(r5), "r"(r6), "r"(r8) : SYSCALL_CLOBBERLIST); - if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); - if (n == SYS_newfstatat) __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) @@ -130,9 +106,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo : "+&r"(r2), "+r"(r7) : "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9) : SYSCALL_CLOBBERLIST); - if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); - if (n == SYS_newfstatat) __stat_fix(c); - return r2; + return r7 ? -r2 : r2; } #define VDSO_USEFUL |