diff options
author | Rich Felker <dalias@aerifal.cx> | 2019-07-18 19:38:12 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2019-07-18 19:38:12 -0400 |
commit | 01ae3fc6d48f4a45535189b7a6db286535af08ca (patch) | |
tree | 5777ee3da734eb3b6a15dedc984bcd9934bf6fde /arch | |
parent | 9493892021eac4edf1776d945bcdd3f7a96f6978 (diff) | |
download | musl-01ae3fc6d48f4a45535189b7a6db286535af08ca.tar.gz |
decouple struct stat from kernel type
presently, all archs/ABIs have struct stat matching the kernel
stat[64] type, except mips/mipsn32/mips64 which do conversion hacks in
syscall_arch.h to work around bugs in the kernel type. this patch
completely decouples them and adds a translation step to the success
path of fstatat. at present, this is just a gratuitous copying, but it
opens up multiple possibilities for future support for 64-bit time_t
on 32-bit archs and for cleaned-up/unified ABIs.
for clarity, the mips hacks are not yet removed in this commit, so the
mips kstat structs still correspond to the output of the hacks in
their syscall_arch.h files, not the raw kernel type. a subsequent
commit will fix this.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/aarch64/kstat.h | 21 | ||||
-rw-r--r-- | arch/arm/kstat.h | 21 | ||||
-rw-r--r-- | arch/i386/kstat.h | 21 | ||||
-rw-r--r-- | arch/m68k/kstat.h | 21 | ||||
-rw-r--r-- | arch/microblaze/kstat.h | 21 | ||||
-rw-r--r-- | arch/mips/kstat.h | 22 | ||||
-rw-r--r-- | arch/mips64/kstat.h | 23 | ||||
-rw-r--r-- | arch/mipsn32/kstat.h | 22 | ||||
-rw-r--r-- | arch/or1k/kstat.h | 21 | ||||
-rw-r--r-- | arch/powerpc/kstat.h | 20 | ||||
-rw-r--r-- | arch/powerpc64/kstat.h | 19 | ||||
-rw-r--r-- | arch/riscv64/kstat.h | 21 | ||||
-rw-r--r-- | arch/s390x/kstat.h | 19 | ||||
-rw-r--r-- | arch/sh/kstat.h | 21 | ||||
-rw-r--r-- | arch/x32/kstat.h | 22 | ||||
-rw-r--r-- | arch/x86_64/kstat.h | 22 |
16 files changed, 337 insertions, 0 deletions
diff --git a/arch/aarch64/kstat.h b/arch/aarch64/kstat.h new file mode 100644 index 00000000..92625f36 --- /dev/null +++ b/arch/aarch64/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + unsigned long __pad; + off_t st_size; + blksize_t st_blksize; + int __pad2; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned __unused[2]; +}; diff --git a/arch/arm/kstat.h b/arch/arm/kstat.h new file mode 100644 index 00000000..af449c95 --- /dev/null +++ b/arch/arm/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + int __st_dev_padding; + long __st_ino_truncated; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + int __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + ino_t st_ino; +}; diff --git a/arch/i386/kstat.h b/arch/i386/kstat.h new file mode 100644 index 00000000..af449c95 --- /dev/null +++ b/arch/i386/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + int __st_dev_padding; + long __st_ino_truncated; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + int __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + ino_t st_ino; +}; diff --git a/arch/m68k/kstat.h b/arch/m68k/kstat.h new file mode 100644 index 00000000..ac13e272 --- /dev/null +++ b/arch/m68k/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + short __st_dev_padding; + long __st_ino_truncated; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + short __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + ino_t st_ino; +}; diff --git a/arch/microblaze/kstat.h b/arch/microblaze/kstat.h new file mode 100644 index 00000000..c1449579 --- /dev/null +++ b/arch/microblaze/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + 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 long __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + int __st_blksize_padding; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned __unused[2]; +}; diff --git a/arch/mips/kstat.h b/arch/mips/kstat.h new file mode 100644 index 00000000..96e4ea34 --- /dev/null +++ b/arch/mips/kstat.h @@ -0,0 +1,22 @@ +struct kstat { + dev_t st_dev; + long __st_padding1[2]; + 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 __st_padding2[2]; + off_t st_size; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + blksize_t st_blksize; + long __st_padding3; + blkcnt_t st_blocks; + long __st_padding4[14]; +}; diff --git a/arch/mips64/kstat.h b/arch/mips64/kstat.h new file mode 100644 index 00000000..74cb5a08 --- /dev/null +++ b/arch/mips64/kstat.h @@ -0,0 +1,23 @@ +struct kstat { + dev_t st_dev; + int __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; + unsigned int __pad2[2]; + off_t st_size; + int __pad3; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + blksize_t st_blksize; + unsigned int __pad4; + blkcnt_t st_blocks; + int __pad5[14]; +}; diff --git a/arch/mipsn32/kstat.h b/arch/mipsn32/kstat.h new file mode 100644 index 00000000..7be515c8 --- /dev/null +++ b/arch/mipsn32/kstat.h @@ -0,0 +1,22 @@ +struct kstat { + dev_t st_dev; + long __pad1[2]; + 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]; + off_t st_size; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + blksize_t st_blksize; + long __pad3; + blkcnt_t st_blocks; + long __pad4[14]; +}; diff --git a/arch/or1k/kstat.h b/arch/or1k/kstat.h new file mode 100644 index 00000000..c1449579 --- /dev/null +++ b/arch/or1k/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + 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 long __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + int __st_blksize_padding; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned __unused[2]; +}; diff --git a/arch/powerpc/kstat.h b/arch/powerpc/kstat.h new file mode 100644 index 00000000..5a611e7b --- /dev/null +++ b/arch/powerpc/kstat.h @@ -0,0 +1,20 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + short __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned __unused[2]; +}; diff --git a/arch/powerpc64/kstat.h b/arch/powerpc64/kstat.h new file mode 100644 index 00000000..887b3e26 --- /dev/null +++ b/arch/powerpc64/kstat.h @@ -0,0 +1,19 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + nlink_t st_nlink; + mode_t st_mode; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned long __unused[3]; +}; diff --git a/arch/riscv64/kstat.h b/arch/riscv64/kstat.h new file mode 100644 index 00000000..92625f36 --- /dev/null +++ b/arch/riscv64/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + unsigned long __pad; + off_t st_size; + blksize_t st_blksize; + int __pad2; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + unsigned __unused[2]; +}; diff --git a/arch/s390x/kstat.h b/arch/s390x/kstat.h new file mode 100644 index 00000000..001c10be --- /dev/null +++ b/arch/s390x/kstat.h @@ -0,0 +1,19 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + nlink_t st_nlink; + mode_t st_mode; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + off_t st_size; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + blksize_t st_blksize; + blkcnt_t st_blocks; + unsigned long __unused[3]; +}; diff --git a/arch/sh/kstat.h b/arch/sh/kstat.h new file mode 100644 index 00000000..af449c95 --- /dev/null +++ b/arch/sh/kstat.h @@ -0,0 +1,21 @@ +struct kstat { + dev_t st_dev; + int __st_dev_padding; + long __st_ino_truncated; + mode_t st_mode; + nlink_t st_nlink; + uid_t st_uid; + gid_t st_gid; + dev_t st_rdev; + int __st_rdev_padding; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + ino_t st_ino; +}; diff --git a/arch/x32/kstat.h b/arch/x32/kstat.h new file mode 100644 index 00000000..ce25fce3 --- /dev/null +++ b/arch/x32/kstat.h @@ -0,0 +1,22 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + nlink_t st_nlink; + + mode_t st_mode; + uid_t st_uid; + gid_t st_gid; + unsigned int __pad0; + dev_t st_rdev; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + + long long st_atime_sec; + long st_atime_nsec; + long long st_mtime_sec; + long st_mtime_nsec; + long long st_ctime_sec; + long st_ctime_nsec; + long long __unused[3]; +}; diff --git a/arch/x86_64/kstat.h b/arch/x86_64/kstat.h new file mode 100644 index 00000000..5976c04e --- /dev/null +++ b/arch/x86_64/kstat.h @@ -0,0 +1,22 @@ +struct kstat { + dev_t st_dev; + ino_t st_ino; + nlink_t st_nlink; + + mode_t st_mode; + uid_t st_uid; + gid_t st_gid; + unsigned int __pad0; + dev_t st_rdev; + off_t st_size; + blksize_t st_blksize; + blkcnt_t st_blocks; + + long st_atime_sec; + long st_atime_nsec; + long st_mtime_sec; + long st_mtime_nsec; + long st_ctime_sec; + long st_ctime_nsec; + long __unused[3]; +}; |