1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
|
From 54e098a366a1d773c4d7d4124f2f5aab976681c3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Jan 2016 19:58:08 +0000
Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t
int64_t is defined in ISO C99
include limits.h to get defintions of PATH_MAX
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
testcases/kernel/fs/fsstress/fsstress.c | 31 +++++++++---------
testcases/network/nfs/nfs_fsstress/fsstress.c | 47 ++++++++++++++-------------
2 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
index 2f89903..89f0b19 100644
--- a/testcases/kernel/fs/fsstress/fsstress.c
+++ b/testcases/kernel/fs/fsstress/fsstress.c
@@ -36,6 +36,7 @@
#ifdef HAVE_SYS_PRCTL_H
# include <sys/prctl.h>
#endif
+#include <limits.h>
#define XFS_ERRTAG_MAX 17
@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)
__u64 last;
__s32 nent;
xfs_bstat_t *t;
- __int64_t total;
+ int64_t total;
xfs_fsop_bulkreq_t bsr;
last = 0;
@@ -1764,14 +1765,14 @@ int setdirect(int fd)
void dread_f(int opno, long r)
{
- __int64_t align;
+ int64_t align;
char *buf = NULL;
struct dioattr diob;
int e;
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)
return;
}
#endif
- align = (__int64_t) diob.d_miniosz;
- lr = ((__int64_t) random() << 32) + random();
+ align = (int64_t) diob.d_miniosz;
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % stb.st_size);
off -= (off % align);
lseek64(fd, off, SEEK_SET);
@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)
void dwrite_f(int opno, long r)
{
- __int64_t align;
+ int64_t align;
char *buf = NULL;
struct dioattr diob;
int e;
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)
return;
}
#endif
- align = (__int64_t) diob.d_miniosz;
- lr = ((__int64_t) random() << 32) + random();
+ align = (int64_t) diob.d_miniosz;
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off -= (off % align);
lseek64(fd, off, SEEK_SET);
@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % stb.st_size);
lseek64(fd, off, SEEK_SET);
len = (random() % (getpagesize() * 32)) + 1;
@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)
{
int e;
pathname_t f;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)
free_pathname(&f);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);
off %= maxfsize;
e = truncate64_path(&f, off) < 0 ? errno : 0;
@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
lseek64(fd, off, SEEK_SET);
diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
index ac91262..a34c416 100644
--- a/testcases/network/nfs/nfs_fsstress/fsstress.c
+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
@@ -31,6 +31,7 @@
*/
#include "global.h"
+#include <limits.h>
#define XFS_ERRTAG_MAX 17
@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)
pathname_t f;
int fd;
struct flock64 fl;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
fl.l_whence = SEEK_SET;
@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)
__uint64_t last;
int nent;
xfs_bstat_t *t;
- __int64_t total;
+ int64_t total;
xfs_fsop_bulkreq_t bsr;
last = 0;
@@ -1708,14 +1709,14 @@ int setdirect(int fd)
void dread_f(int opno, long r)
{
- __int64_t align;
+ int64_t align;
char *buf;
struct dioattr diob;
int e;
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)
return;
}
#endif
- align = (__int64_t) diob.d_miniosz;
- lr = ((__int64_t) random() << 32) + random();
+ align = (int64_t) diob.d_miniosz;
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % stb.st_size);
off -= (off % align);
lseek64(fd, off, SEEK_SET);
@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)
void dwrite_f(int opno, long r)
{
- __int64_t align;
+ int64_t align;
char *buf;
struct dioattr diob;
int e;
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)
return;
}
#endif
- align = (__int64_t) diob.d_miniosz;
- lr = ((__int64_t) random() << 32) + random();
+ align = (int64_t) diob.d_miniosz;
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off -= (off % align);
lseek64(fd, off, SEEK_SET);
@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)
pathname_t f;
int fd;
struct flock64 fl;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
fl.l_whence = SEEK_SET;
@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % stb.st_size);
lseek64(fd, off, SEEK_SET);
len = (random() % (getpagesize() * 32)) + 1;
@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)
pathname_t f;
int fd;
struct flock64 fl;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
fl.l_whence = SEEK_SET;
@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)
{
int e;
pathname_t f;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)
free_pathname(&f);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
e = truncate64_path(&f, off) < 0 ? errno : 0;
@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)
pathname_t f;
int fd;
struct flock64 fl;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
fl.l_whence = SEEK_SET;
@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)
pathname_t f;
int fd;
size_t len;
- __int64_t lr;
+ int64_t lr;
off64_t off;
struct stat64 stb;
int v;
@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)
close(fd);
return;
}
- lr = ((__int64_t) random() << 32) + random();
+ lr = ((int64_t) random() << 32) + random();
off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
off %= maxfsize;
lseek64(fd, off, SEEK_SET);
--
2.7.0
|
