Skip to content

Commit 7c42066

Browse files
committed
Only mips uses a special statfs(64)
1 parent 5c985b7 commit 7c42066

File tree

8 files changed

+70
-184
lines changed

8 files changed

+70
-184
lines changed

src/unix/linux_like/linux/musl/b32/arm/mod.rs

-30
Original file line numberDiff line numberDiff line change
@@ -97,36 +97,6 @@ s! {
9797
__pad2: ::c_ulong,
9898
}
9999

100-
pub struct statfs {
101-
pub f_type: ::c_ulong,
102-
pub f_bsize: ::c_ulong,
103-
pub f_blocks: ::fsblkcnt_t,
104-
pub f_bfree: ::fsblkcnt_t,
105-
pub f_bavail: ::fsblkcnt_t,
106-
pub f_files: ::fsfilcnt_t,
107-
pub f_ffree: ::fsfilcnt_t,
108-
pub f_fsid: ::fsid_t,
109-
pub f_namelen: ::c_ulong,
110-
pub f_frsize: ::c_ulong,
111-
pub f_flags: ::c_ulong,
112-
pub f_spare: [::c_ulong; 4],
113-
}
114-
115-
pub struct statfs64 {
116-
pub f_type: ::c_ulong,
117-
pub f_bsize: ::c_ulong,
118-
pub f_blocks: ::fsblkcnt_t,
119-
pub f_bfree: ::fsblkcnt_t,
120-
pub f_bavail: ::fsblkcnt_t,
121-
pub f_files: ::fsfilcnt_t,
122-
pub f_ffree: ::fsfilcnt_t,
123-
pub f_fsid: ::fsid_t,
124-
pub f_namelen: ::c_ulong,
125-
pub f_frsize: ::c_ulong,
126-
pub f_flags: ::c_ulong,
127-
pub f_spare: [::c_ulong; 4],
128-
}
129-
130100
pub struct mcontext_t {
131101
pub trap_no: ::c_ulong,
132102
pub error_code: ::c_ulong,

src/unix/linux_like/linux/musl/b32/hexagon.rs

-30
Original file line numberDiff line numberDiff line change
@@ -75,36 +75,6 @@ s! {
7575
__pad1: ::c_ulong,
7676
__pad2: ::c_ulong,
7777
}
78-
79-
pub struct statfs {
80-
pub f_type: ::c_ulong,
81-
pub f_bsize: ::c_ulong,
82-
pub f_blocks: ::fsblkcnt_t,
83-
pub f_bfree: ::fsblkcnt_t,
84-
pub f_bavail: ::fsblkcnt_t,
85-
pub f_files: ::fsfilcnt_t,
86-
pub f_ffree: ::fsfilcnt_t,
87-
pub f_fsid: ::fsid_t,
88-
pub f_namelen: ::c_ulong,
89-
pub f_frsize: ::c_ulong,
90-
pub f_flags: ::c_ulong,
91-
pub f_spare: [::c_ulong; 4],
92-
}
93-
94-
pub struct statfs64 {
95-
pub f_type: ::c_ulong,
96-
pub f_bsize: ::c_ulong,
97-
pub f_blocks: ::fsblkcnt_t,
98-
pub f_bfree: ::fsblkcnt_t,
99-
pub f_bavail: ::fsblkcnt_t,
100-
pub f_files: ::fsfilcnt_t,
101-
pub f_ffree: ::fsfilcnt_t,
102-
pub f_fsid: ::fsid_t,
103-
pub f_namelen: ::c_ulong,
104-
pub f_frsize: ::c_ulong,
105-
pub f_flags: ::c_ulong,
106-
pub f_spare: [::c_ulong; 4],
107-
}
10878
}
10979

11080
pub const AF_FILE: ::c_int = 1;

src/unix/linux_like/linux/musl/b32/powerpc.rs

-30
Original file line numberDiff line numberDiff line change
@@ -96,36 +96,6 @@ s! {
9696
__pad1: ::c_ulong,
9797
__pad2: ::c_ulong,
9898
}
99-
100-
pub struct statfs {
101-
pub f_type: ::c_ulong,
102-
pub f_bsize: ::c_ulong,
103-
pub f_blocks: ::fsblkcnt_t,
104-
pub f_bfree: ::fsblkcnt_t,
105-
pub f_bavail: ::fsblkcnt_t,
106-
pub f_files: ::fsfilcnt_t,
107-
pub f_ffree: ::fsfilcnt_t,
108-
pub f_fsid: ::fsid_t,
109-
pub f_namelen: ::c_ulong,
110-
pub f_frsize: ::c_ulong,
111-
pub f_flags: ::c_ulong,
112-
pub f_spare: [::c_ulong; 4],
113-
}
114-
115-
pub struct statfs64 {
116-
pub f_type: ::c_ulong,
117-
pub f_bsize: ::c_ulong,
118-
pub f_blocks: ::fsblkcnt_t,
119-
pub f_bfree: ::fsblkcnt_t,
120-
pub f_bavail: ::fsblkcnt_t,
121-
pub f_files: ::fsfilcnt_t,
122-
pub f_ffree: ::fsfilcnt_t,
123-
pub f_fsid: ::fsid_t,
124-
pub f_namelen: ::c_ulong,
125-
pub f_frsize: ::c_ulong,
126-
pub f_flags: ::c_ulong,
127-
pub f_spare: [::c_ulong; 4],
128-
}
12999
}
130100

131101
pub const MADV_SOFT_OFFLINE: ::c_int = 101;

src/unix/linux_like/linux/musl/b32/riscv32/mod.rs

-30
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,6 @@ s! {
4848
__unused: [::c_int; 2],
4949
}
5050

51-
pub struct statfs {
52-
pub f_type: ::c_long,
53-
pub f_bsize: ::c_long,
54-
pub f_blocks: ::fsblkcnt_t,
55-
pub f_bfree: ::fsblkcnt_t,
56-
pub f_bavail: ::fsblkcnt_t,
57-
pub f_files: ::fsfilcnt_t,
58-
pub f_ffree: ::fsfilcnt_t,
59-
pub f_fsid: ::fsid_t,
60-
pub f_namelen: ::c_long,
61-
pub f_frsize: ::c_long,
62-
pub f_flags: ::c_long,
63-
pub f_spare: [::c_long; 4],
64-
}
65-
66-
pub struct statfs64 {
67-
pub f_type: ::c_ulong,
68-
pub f_bsize: ::c_ulong,
69-
pub f_blocks: ::fsblkcnt_t,
70-
pub f_bfree: ::fsblkcnt_t,
71-
pub f_bavail: ::fsblkcnt_t,
72-
pub f_files: ::fsfilcnt_t,
73-
pub f_ffree: ::fsfilcnt_t,
74-
pub f_fsid: ::fsid_t,
75-
pub f_namelen: ::c_ulong,
76-
pub f_frsize: ::c_ulong,
77-
pub f_flags: ::c_ulong,
78-
pub f_spare: [::c_ulong; 4],
79-
}
80-
8151
pub struct stack_t {
8252
pub ss_sp: *mut ::c_void,
8353
pub ss_flags: ::c_int,

src/unix/linux_like/linux/musl/b32/x86/mod.rs

+4-34
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ s! {
4646
pub st_ino: ::ino_t,
4747
}
4848

49+
pub struct mcontext_t {
50+
__private: [u32; 22]
51+
}
52+
4953
pub struct stack_t {
5054
pub ss_sp: *mut ::c_void,
5155
pub ss_flags: ::c_int,
@@ -96,40 +100,6 @@ s! {
96100
__pad1: ::c_ulong,
97101
__pad2: ::c_ulong,
98102
}
99-
100-
pub struct statfs {
101-
pub f_type: ::c_ulong,
102-
pub f_bsize: ::c_ulong,
103-
pub f_blocks: ::fsblkcnt_t,
104-
pub f_bfree: ::fsblkcnt_t,
105-
pub f_bavail: ::fsblkcnt_t,
106-
pub f_files: ::fsfilcnt_t,
107-
pub f_ffree: ::fsfilcnt_t,
108-
pub f_fsid: ::fsid_t,
109-
pub f_namelen: ::c_ulong,
110-
pub f_frsize: ::c_ulong,
111-
pub f_flags: ::c_ulong,
112-
pub f_spare: [::c_ulong; 4],
113-
}
114-
115-
pub struct mcontext_t {
116-
__private: [u32; 22]
117-
}
118-
119-
pub struct statfs64 {
120-
pub f_type: ::c_ulong,
121-
pub f_bsize: ::c_ulong,
122-
pub f_blocks: ::fsblkcnt_t,
123-
pub f_bfree: ::fsblkcnt_t,
124-
pub f_bavail: ::fsblkcnt_t,
125-
pub f_files: ::fsfilcnt_t,
126-
pub f_ffree: ::fsfilcnt_t,
127-
pub f_fsid: ::fsid_t,
128-
pub f_namelen: ::c_ulong,
129-
pub f_frsize: ::c_ulong,
130-
pub f_flags: ::c_ulong,
131-
pub f_spare: [::c_ulong; 4],
132-
}
133103
}
134104

135105
s_no_extra_traits! {

src/unix/linux_like/linux/musl/b64/mips64.rs

+30
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,36 @@ s! {
5454
__pad5: [::c_int; 14],
5555
}
5656

57+
pub struct statfs {
58+
pub f_type: ::c_ulong,
59+
pub f_bsize: ::c_ulong,
60+
pub f_frsize: ::c_ulong,
61+
pub f_blocks: ::fsblkcnt_t,
62+
pub f_bfree: ::fsblkcnt_t,
63+
pub f_files: ::fsfilcnt_t,
64+
pub f_ffree: ::fsfilcnt_t,
65+
pub f_bavail: ::fsblkcnt_t,
66+
pub f_fsid: ::fsid_t,
67+
pub f_namelen: ::c_ulong,
68+
pub f_flags: ::c_ulong,
69+
pub f_spare: [::c_ulong; 5],
70+
}
71+
72+
pub struct statfs64 {
73+
pub f_type: ::c_ulong,
74+
pub f_bsize: ::c_ulong,
75+
pub f_frsize: ::c_ulong,
76+
pub f_blocks: ::fsblkcnt64_t,
77+
pub f_bfree: ::fsblkcnt64_t,
78+
pub f_files: ::fsfilcnt64_t,
79+
pub f_ffree: ::fsfilcnt64_t,
80+
pub f_bavail: ::fsblkcnt64_t,
81+
pub f_fsid: ::fsid_t,
82+
pub f_namelen: ::c_ulong,
83+
pub f_flags: ::c_ulong,
84+
pub f_spare: [::c_ulong; 5],
85+
}
86+
5787
pub struct ipc_perm {
5888
pub __ipc_perm_key: ::key_t,
5989
pub uid: ::uid_t,

src/unix/linux_like/linux/musl/b64/mod.rs

-30
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,6 @@ s! {
4444
__pad2: ::c_ulong,
4545
}
4646

47-
pub struct statfs {
48-
pub f_type: ::c_ulong,
49-
pub f_bsize: ::c_ulong,
50-
pub f_blocks: ::fsblkcnt_t,
51-
pub f_bfree: ::fsblkcnt_t,
52-
pub f_bavail: ::fsblkcnt_t,
53-
pub f_files: ::fsfilcnt_t,
54-
pub f_ffree: ::fsfilcnt_t,
55-
pub f_fsid: ::fsid_t,
56-
pub f_namelen: ::c_ulong,
57-
pub f_frsize: ::c_ulong,
58-
pub f_flags: ::c_ulong,
59-
pub f_spare: [::c_ulong; 4],
60-
}
61-
62-
pub struct statfs64 {
63-
pub f_type: ::c_ulong,
64-
pub f_bsize: ::c_ulong,
65-
pub f_blocks: ::fsblkcnt64_t,
66-
pub f_bfree: ::fsblkcnt64_t,
67-
pub f_bavail: ::fsblkcnt64_t,
68-
pub f_files: ::fsfilcnt64_t,
69-
pub f_ffree: ::fsfilcnt64_t,
70-
pub f_fsid: ::fsid_t,
71-
pub f_namelen: ::c_ulong,
72-
pub f_frsize: ::c_ulong,
73-
pub f_flags: ::c_ulong,
74-
pub f_spare: [::c_ulong; 4],
75-
}
76-
7747
pub struct msghdr {
7848
pub msg_name: *mut ::c_void,
7949
pub msg_namelen: ::socklen_t,

src/unix/linux_like/linux/musl/mod.rs

+36
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,42 @@ s! {
315315
}
316316
}
317317

318+
cfg_if! {
319+
if #[cfg(not(target_arch = "mips"))] {
320+
s! {
321+
pub struct statfs {
322+
pub f_type: ::c_ulong,
323+
pub f_bsize: ::c_ulong,
324+
pub f_blocks: ::fsblkcnt_t,
325+
pub f_bfree: ::fsblkcnt_t,
326+
pub f_bavail: ::fsblkcnt_t,
327+
pub f_files: ::fsfilcnt_t,
328+
pub f_ffree: ::fsfilcnt_t,
329+
pub f_fsid: ::fsid_t,
330+
pub f_namelen: ::c_ulong,
331+
pub f_frsize: ::c_ulong,
332+
pub f_flags: ::c_ulong,
333+
pub f_spare: [::c_ulong; 4],
334+
}
335+
336+
pub struct statfs64 {
337+
pub f_type: ::c_ulong,
338+
pub f_bsize: ::c_ulong,
339+
pub f_blocks: ::fsblkcnt64_t,
340+
pub f_bfree: ::fsblkcnt64_t,
341+
pub f_bavail: ::fsblkcnt64_t,
342+
pub f_files: ::fsfilcnt64_t,
343+
pub f_ffree: ::fsfilcnt64_t,
344+
pub f_fsid: ::fsid_t,
345+
pub f_namelen: ::c_ulong,
346+
pub f_frsize: ::c_ulong,
347+
pub f_flags: ::c_ulong,
348+
pub f_spare: [::c_ulong; 4],
349+
}
350+
}
351+
}
352+
}
353+
318354
s_no_extra_traits! {
319355
pub struct sysinfo {
320356
pub uptime: ::c_ulong,

0 commit comments

Comments
 (0)