Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From f260099fc45f0653aa4758d1d581e07f5b9c6a54 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 21 Dec 2022 17:43:07 -0800 |
| 4 | Subject: [PATCH] Replace off64_t/stat64 with off_t/stat |
| 5 | |
| 6 | When using AC_SYS_LARGEFILE, it will automatically add |
| 7 | -D_FILE_OFFSET_BITS=64 to enable 64bit off_t and all lfs64 support |
| 8 | |
| 9 | helps compile on musl where off_t was always 64bit and lfs64 were never |
| 10 | needed |
| 11 | |
| 12 | Upstream-Status: Submitted [https://lore.kernel.org/linux-xfs/20221222015327.939932-1-raj.khem@gmail.com/T/#t] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 14 | |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 15 | --- |
| 16 | copy/xfs_copy.c | 2 +- |
| 17 | fsr/xfs_fsr.c | 2 +- |
| 18 | io/bmap.c | 6 +++--- |
| 19 | io/copy_file_range.c | 4 ++-- |
| 20 | io/cowextsize.c | 6 +++--- |
| 21 | io/fadvise.c | 2 +- |
| 22 | io/fiemap.c | 6 +++--- |
| 23 | io/fsmap.c | 6 +++--- |
| 24 | io/io.h | 10 +++++----- |
| 25 | io/madvise.c | 2 +- |
| 26 | io/mincore.c | 2 +- |
| 27 | io/mmap.c | 12 ++++++------ |
| 28 | io/pread.c | 22 +++++++++++----------- |
| 29 | io/pwrite.c | 20 ++++++++++---------- |
| 30 | io/reflink.c | 4 ++-- |
| 31 | io/seek.c | 6 +++--- |
| 32 | io/sendfile.c | 6 +++--- |
| 33 | io/stat.c | 2 +- |
| 34 | io/sync_file_range.c | 2 +- |
| 35 | io/truncate.c | 2 +- |
| 36 | libxfs/rdwr.c | 8 ++++---- |
| 37 | mdrestore/xfs_mdrestore.c | 2 +- |
| 38 | repair/prefetch.c | 2 +- |
| 39 | scrub/spacemap.c | 6 +++--- |
| 40 | spaceman/freesp.c | 4 ++-- |
| 41 | spaceman/trim.c | 2 +- |
| 42 | 26 files changed, 74 insertions(+), 74 deletions(-) |
| 43 | |
| 44 | diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 45 | index 79f6594..854fd7f 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 46 | --- a/copy/xfs_copy.c |
| 47 | +++ b/copy/xfs_copy.c |
| 48 | @@ -888,7 +888,7 @@ main(int argc, char **argv) |
| 49 | } |
| 50 | } else { |
| 51 | char *lb[XFS_MAX_SECTORSIZE] = { NULL }; |
| 52 | - off64_t off; |
| 53 | + off_t off; |
| 54 | |
| 55 | /* ensure device files are sufficiently large */ |
| 56 | |
| 57 | diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 58 | index ba02506..12fffbd 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 59 | --- a/fsr/xfs_fsr.c |
| 60 | +++ b/fsr/xfs_fsr.c |
| 61 | @@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, |
| 62 | struct dioattr dio; |
| 63 | static xfs_swapext_t sx; |
| 64 | struct xfs_flock64 space; |
| 65 | - off64_t cnt, pos; |
| 66 | + off_t cnt, pos; |
| 67 | void *fbuf = NULL; |
| 68 | int ct, wc, wc_b4; |
| 69 | char ffname[SMBUFSZ]; |
| 70 | diff --git a/io/bmap.c b/io/bmap.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 71 | index 27383ca..0b14bb7 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 72 | --- a/io/bmap.c |
| 73 | +++ b/io/bmap.c |
| 74 | @@ -257,7 +257,7 @@ bmap_f( |
| 75 | #define FLG_BSW 0000010 /* Not on begin of stripe width */ |
| 76 | #define FLG_ESW 0000001 /* Not on end of stripe width */ |
| 77 | int agno; |
| 78 | - off64_t agoff, bbperag; |
| 79 | + off_t agoff, bbperag; |
| 80 | int foff_w, boff_w, aoff_w, tot_w, agno_w; |
| 81 | char rbuf[32], bbuf[32], abuf[32]; |
| 82 | int sunit, swidth; |
| 83 | @@ -267,8 +267,8 @@ bmap_f( |
| 84 | if (is_rt) |
| 85 | sunit = swidth = bbperag = 0; |
| 86 | else { |
| 87 | - bbperag = (off64_t)fsgeo.agblocks * |
| 88 | - (off64_t)fsgeo.blocksize / BBSIZE; |
| 89 | + bbperag = (off_t)fsgeo.agblocks * |
| 90 | + (off_t)fsgeo.blocksize / BBSIZE; |
| 91 | sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE; |
| 92 | swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; |
| 93 | } |
| 94 | diff --git a/io/copy_file_range.c b/io/copy_file_range.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 95 | index d154fa7..422e691 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 96 | --- a/io/copy_file_range.c |
| 97 | +++ b/io/copy_file_range.c |
| 98 | @@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) |
| 99 | return 0; |
| 100 | } |
| 101 | |
| 102 | -static off64_t |
| 103 | +static off_t |
| 104 | copy_src_filesize(int fd) |
| 105 | { |
| 106 | struct stat st; |
| 107 | @@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv) |
| 108 | } |
| 109 | |
| 110 | if (!len_specified) { |
| 111 | - off64_t sz; |
| 112 | + off_t sz; |
| 113 | |
| 114 | sz = copy_src_filesize(fd); |
| 115 | if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { |
| 116 | diff --git a/io/cowextsize.c b/io/cowextsize.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 117 | index f6b134d..00e40c6 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 118 | --- a/io/cowextsize.c |
| 119 | +++ b/io/cowextsize.c |
| 120 | @@ -50,10 +50,10 @@ static int |
| 121 | set_cowextsize(const char *path, int fd, long extsz) |
| 122 | { |
| 123 | struct fsxattr fsx; |
| 124 | - struct stat64 stat; |
| 125 | + struct stat stat; |
| 126 | |
| 127 | - if (fstat64(fd, &stat) < 0) { |
| 128 | - perror("fstat64"); |
| 129 | + if (fstat(fd, &stat) < 0) { |
| 130 | + perror("fstat"); |
| 131 | exitcode = 1; |
| 132 | return 0; |
| 133 | } |
| 134 | diff --git a/io/fadvise.c b/io/fadvise.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 135 | index 60cc0f0..0966c41 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 136 | --- a/io/fadvise.c |
| 137 | +++ b/io/fadvise.c |
| 138 | @@ -39,7 +39,7 @@ fadvise_f( |
| 139 | int argc, |
| 140 | char **argv) |
| 141 | { |
| 142 | - off64_t offset = 0, length = 0; |
| 143 | + off_t offset = 0, length = 0; |
| 144 | int c, range = 0, advise = POSIX_FADV_NORMAL; |
| 145 | |
| 146 | while ((c = getopt(argc, argv, "dnrsw")) != EOF) { |
| 147 | diff --git a/io/fiemap.c b/io/fiemap.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 148 | index f0c74df..b41f71b 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 149 | --- a/io/fiemap.c |
| 150 | +++ b/io/fiemap.c |
| 151 | @@ -234,9 +234,9 @@ fiemap_f( |
| 152 | int tot_w = 5; /* 5 since its just one number */ |
| 153 | int flg_w = 5; |
| 154 | __u64 last_logical = 0; /* last extent offset handled */ |
| 155 | - off64_t start_offset = 0; /* mapping start */ |
| 156 | - off64_t length = -1LL; /* mapping length */ |
| 157 | - off64_t range_end = -1LL; /* mapping end*/ |
| 158 | + off_t start_offset = 0; /* mapping start */ |
| 159 | + off_t length = -1LL; /* mapping length */ |
| 160 | + off_t range_end = -1LL; /* mapping end*/ |
| 161 | size_t fsblocksize, fssectsize; |
| 162 | struct stat st; |
| 163 | |
| 164 | diff --git a/io/fsmap.c b/io/fsmap.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 165 | index 7db5184..bf11963 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 166 | --- a/io/fsmap.c |
| 167 | +++ b/io/fsmap.c |
| 168 | @@ -170,7 +170,7 @@ dump_map_verbose( |
| 169 | unsigned long long i; |
| 170 | struct fsmap *p; |
| 171 | int agno; |
| 172 | - off64_t agoff, bperag; |
| 173 | + off_t agoff, bperag; |
| 174 | int foff_w, boff_w, aoff_w, tot_w, agno_w, own_w; |
| 175 | int nr_w, dev_w; |
| 176 | char rbuf[40], bbuf[40], abuf[40], obuf[40]; |
| 177 | @@ -183,8 +183,8 @@ dump_map_verbose( |
| 178 | dev_w = 3; |
| 179 | nr_w = 4; |
| 180 | tot_w = MINTOT_WIDTH; |
| 181 | - bperag = (off64_t)fsgeo->agblocks * |
| 182 | - (off64_t)fsgeo->blocksize; |
| 183 | + bperag = (off_t)fsgeo->agblocks * |
| 184 | + (off_t)fsgeo->blocksize; |
| 185 | sunit = (fsgeo->sunit * fsgeo->blocksize); |
| 186 | swidth = (fsgeo->swidth * fsgeo->blocksize); |
| 187 | |
| 188 | diff --git a/io/io.h b/io/io.h |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 189 | index 64b7a66..5f42301 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 190 | --- a/io/io.h |
| 191 | +++ b/io/io.h |
| 192 | @@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); |
| 193 | typedef struct mmap_region { |
| 194 | void *addr; /* address of start of mapping */ |
| 195 | size_t length; /* length of mapping */ |
| 196 | - off64_t offset; /* start offset into backing file */ |
| 197 | + off_t offset; /* start offset into backing file */ |
| 198 | int prot; /* protection mode of the mapping */ |
| 199 | int flags; /* MAP_* flags passed to mmap() */ |
| 200 | char *name; /* name of backing file */ |
| 201 | @@ -63,13 +63,13 @@ extern mmap_region_t *maptable; /* mmap'd region array */ |
| 202 | extern int mapcount; /* #entries in the mapping table */ |
| 203 | extern mmap_region_t *mapping; /* active mapping table entry */ |
| 204 | extern int maplist_f(void); |
| 205 | -extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int); |
| 206 | +extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int); |
| 207 | |
| 208 | /* |
| 209 | * Various xfs_io helper routines/globals |
| 210 | */ |
| 211 | |
| 212 | -extern off64_t filesize(void); |
| 213 | +extern off_t filesize(void); |
| 214 | extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, |
| 215 | struct fs_path *); |
| 216 | extern int addfile(char *, int , struct xfs_fsop_geom *, int, |
| 217 | @@ -84,9 +84,9 @@ extern size_t io_buffersize; |
| 218 | extern int vectors; |
| 219 | extern struct iovec *iov; |
| 220 | extern int alloc_buffer(size_t, int, unsigned int); |
| 221 | -extern int read_buffer(int, off64_t, long long, long long *, |
| 222 | +extern int read_buffer(int, off_t, long long, long long *, |
| 223 | int, int); |
| 224 | -extern void dump_buffer(off64_t, ssize_t); |
| 225 | +extern void dump_buffer(off_t, ssize_t); |
| 226 | |
| 227 | extern void attr_init(void); |
| 228 | extern void bmap_init(void); |
| 229 | diff --git a/io/madvise.c b/io/madvise.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 230 | index bde3153..6e9c5b1 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 231 | --- a/io/madvise.c |
| 232 | +++ b/io/madvise.c |
| 233 | @@ -39,7 +39,7 @@ madvise_f( |
| 234 | int argc, |
| 235 | char **argv) |
| 236 | { |
| 237 | - off64_t offset, llength; |
| 238 | + off_t offset, llength; |
| 239 | size_t length; |
| 240 | void *start; |
| 241 | int advise = MADV_NORMAL, c; |
| 242 | diff --git a/io/mincore.c b/io/mincore.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 243 | index 67f1d6c..24147ac 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 244 | --- a/io/mincore.c |
| 245 | +++ b/io/mincore.c |
| 246 | @@ -17,7 +17,7 @@ mincore_f( |
| 247 | int argc, |
| 248 | char **argv) |
| 249 | { |
| 250 | - off64_t offset, llength; |
| 251 | + off_t offset, llength; |
| 252 | size_t length; |
| 253 | size_t blocksize, sectsize; |
| 254 | void *start; |
| 255 | diff --git a/io/mmap.c b/io/mmap.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 256 | index 7114404..128a2c0 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 257 | --- a/io/mmap.c |
| 258 | +++ b/io/mmap.c |
| 259 | @@ -64,11 +64,11 @@ print_mapping( |
| 260 | void * |
| 261 | check_mapping_range( |
| 262 | mmap_region_t *map, |
| 263 | - off64_t offset, |
| 264 | + off_t offset, |
| 265 | size_t length, |
| 266 | int pagealign) |
| 267 | { |
| 268 | - off64_t relative; |
| 269 | + off_t relative; |
| 270 | |
| 271 | if (offset < mapping->offset) { |
| 272 | printf(_("offset (%lld) is before start of mapping (%lld)\n"), |
| 273 | @@ -156,7 +156,7 @@ mmap_f( |
| 274 | int argc, |
| 275 | char **argv) |
| 276 | { |
| 277 | - off64_t offset; |
| 278 | + off_t offset; |
| 279 | ssize_t length = 0, length2 = 0; |
| 280 | void *address = NULL; |
| 281 | char *filename; |
| 282 | @@ -309,7 +309,7 @@ msync_f( |
| 283 | int argc, |
| 284 | char **argv) |
| 285 | { |
| 286 | - off64_t offset; |
| 287 | + off_t offset; |
| 288 | ssize_t length; |
| 289 | void *start; |
| 290 | int c, flags = 0; |
| 291 | @@ -402,7 +402,7 @@ mread_f( |
| 292 | int argc, |
| 293 | char **argv) |
| 294 | { |
| 295 | - off64_t offset, tmp, dumpoffset, printoffset; |
| 296 | + off_t offset, tmp, dumpoffset, printoffset; |
| 297 | ssize_t length; |
| 298 | size_t dumplen, cnt = 0; |
| 299 | char *bp; |
| 300 | @@ -567,7 +567,7 @@ mwrite_f( |
| 301 | int argc, |
| 302 | char **argv) |
| 303 | { |
| 304 | - off64_t offset, tmp; |
| 305 | + off_t offset, tmp; |
| 306 | ssize_t length; |
| 307 | void *start; |
| 308 | char *sp; |
| 309 | diff --git a/io/pread.c b/io/pread.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 310 | index 0f1d8b9..79990c6 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 311 | --- a/io/pread.c |
| 312 | +++ b/io/pread.c |
| 313 | @@ -116,7 +116,7 @@ alloc_buffer( |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 314 | static void |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 315 | __dump_buffer( |
| 316 | void *buf, |
| 317 | - off64_t offset, |
| 318 | + off_t offset, |
| 319 | ssize_t len) |
| 320 | { |
| 321 | int i, j; |
| 322 | @@ -141,7 +141,7 @@ __dump_buffer( |
| 323 | |
| 324 | void |
| 325 | dump_buffer( |
| 326 | - off64_t offset, |
| 327 | + off_t offset, |
| 328 | ssize_t len) |
| 329 | { |
| 330 | int i, l; |
| 331 | @@ -164,7 +164,7 @@ dump_buffer( |
| 332 | static ssize_t |
| 333 | do_preadv( |
| 334 | int fd, |
| 335 | - off64_t offset, |
| 336 | + off_t offset, |
| 337 | long long count) |
| 338 | { |
| 339 | int vecs = 0; |
| 340 | @@ -199,7 +199,7 @@ do_preadv( |
| 341 | static ssize_t |
| 342 | do_pread( |
| 343 | int fd, |
| 344 | - off64_t offset, |
| 345 | + off_t offset, |
| 346 | long long count, |
| 347 | size_t buffer_size) |
| 348 | { |
| 349 | @@ -212,13 +212,13 @@ do_pread( |
| 350 | static int |
| 351 | read_random( |
| 352 | int fd, |
| 353 | - off64_t offset, |
| 354 | + off_t offset, |
| 355 | long long count, |
| 356 | long long *total, |
| 357 | unsigned int seed, |
| 358 | int eof) |
| 359 | { |
| 360 | - off64_t end, off, range; |
| 361 | + off_t end, off, range; |
| 362 | ssize_t bytes; |
| 363 | int ops = 0; |
| 364 | |
| 365 | @@ -259,12 +259,12 @@ read_random( |
| 366 | static int |
| 367 | read_backward( |
| 368 | int fd, |
| 369 | - off64_t *offset, |
| 370 | + off_t *offset, |
| 371 | long long *count, |
| 372 | long long *total, |
| 373 | int eof) |
| 374 | { |
| 375 | - off64_t end, off = *offset; |
| 376 | + off_t end, off = *offset; |
| 377 | ssize_t bytes = 0, bytes_requested; |
| 378 | long long cnt = *count; |
| 379 | int ops = 0; |
| 380 | @@ -319,7 +319,7 @@ read_backward( |
| 381 | static int |
| 382 | read_forward( |
| 383 | int fd, |
| 384 | - off64_t offset, |
| 385 | + off_t offset, |
| 386 | long long count, |
| 387 | long long *total, |
| 388 | int verbose, |
| 389 | @@ -353,7 +353,7 @@ read_forward( |
| 390 | int |
| 391 | read_buffer( |
| 392 | int fd, |
| 393 | - off64_t offset, |
| 394 | + off_t offset, |
| 395 | long long count, |
| 396 | long long *total, |
| 397 | int verbose, |
| 398 | @@ -368,7 +368,7 @@ pread_f( |
| 399 | char **argv) |
| 400 | { |
| 401 | size_t bsize; |
| 402 | - off64_t offset; |
| 403 | + off_t offset; |
| 404 | unsigned int zeed = 0; |
| 405 | long long count, total, tmp; |
| 406 | size_t fsblocksize, fssectsize; |
| 407 | diff --git a/io/pwrite.c b/io/pwrite.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 408 | index 467bfa9..8d134c5 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 409 | --- a/io/pwrite.c |
| 410 | +++ b/io/pwrite.c |
| 411 | @@ -54,7 +54,7 @@ pwrite_help(void) |
| 412 | static ssize_t |
| 413 | do_pwritev( |
| 414 | int fd, |
| 415 | - off64_t offset, |
| 416 | + off_t offset, |
| 417 | long long count, |
| 418 | int pwritev2_flags) |
| 419 | { |
| 420 | @@ -97,7 +97,7 @@ do_pwritev( |
| 421 | static ssize_t |
| 422 | do_pwrite( |
| 423 | int fd, |
| 424 | - off64_t offset, |
| 425 | + off_t offset, |
| 426 | long long count, |
| 427 | size_t buffer_size, |
| 428 | int pwritev2_flags) |
| 429 | @@ -110,13 +110,13 @@ do_pwrite( |
| 430 | |
| 431 | static int |
| 432 | write_random( |
| 433 | - off64_t offset, |
| 434 | + off_t offset, |
| 435 | long long count, |
| 436 | unsigned int seed, |
| 437 | long long *total, |
| 438 | int pwritev2_flags) |
| 439 | { |
| 440 | - off64_t off, range; |
| 441 | + off_t off, range; |
| 442 | ssize_t bytes; |
| 443 | int ops = 0; |
| 444 | |
| 445 | @@ -155,12 +155,12 @@ write_random( |
| 446 | |
| 447 | static int |
| 448 | write_backward( |
| 449 | - off64_t offset, |
| 450 | + off_t offset, |
| 451 | long long *count, |
| 452 | long long *total, |
| 453 | int pwritev2_flags) |
| 454 | { |
| 455 | - off64_t end, off = offset; |
| 456 | + off_t end, off = offset; |
| 457 | ssize_t bytes = 0, bytes_requested; |
| 458 | long long cnt = *count; |
| 459 | int ops = 0; |
| 460 | @@ -214,11 +214,11 @@ write_backward( |
| 461 | |
| 462 | static int |
| 463 | write_buffer( |
| 464 | - off64_t offset, |
| 465 | + off_t offset, |
| 466 | long long count, |
| 467 | size_t bs, |
| 468 | int fd, |
| 469 | - off64_t skip, |
| 470 | + off_t skip, |
| 471 | long long *total, |
| 472 | int pwritev2_flags) |
| 473 | { |
| 474 | @@ -253,7 +253,7 @@ write_buffer( |
| 475 | |
| 476 | static int |
| 477 | write_once( |
| 478 | - off64_t offset, |
| 479 | + off_t offset, |
| 480 | long long count, |
| 481 | long long *total, |
| 482 | int pwritev2_flags) |
| 483 | @@ -275,7 +275,7 @@ pwrite_f( |
| 484 | char **argv) |
| 485 | { |
| 486 | size_t bsize; |
| 487 | - off64_t offset, skip = 0; |
| 488 | + off_t offset, skip = 0; |
| 489 | long long count, total, tmp; |
| 490 | unsigned int zeed = 0, seed = 0xcdcdcdcd; |
| 491 | size_t fsblocksize, fssectsize; |
| 492 | diff --git a/io/reflink.c b/io/reflink.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 493 | index 8e4f389..b6a3c05 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 494 | --- a/io/reflink.c |
| 495 | +++ b/io/reflink.c |
| 496 | @@ -98,7 +98,7 @@ dedupe_f( |
| 497 | int argc, |
| 498 | char **argv) |
| 499 | { |
| 500 | - off64_t soffset, doffset; |
| 501 | + off_t soffset, doffset; |
| 502 | long long count, total; |
| 503 | char *infile; |
| 504 | int condensed, quiet_flag; |
| 505 | @@ -226,7 +226,7 @@ reflink_f( |
| 506 | int argc, |
| 507 | char **argv) |
| 508 | { |
| 509 | - off64_t soffset, doffset; |
| 510 | + off_t soffset, doffset; |
| 511 | long long count = 0, total; |
| 512 | char *infile = NULL; |
| 513 | int condensed, quiet_flag; |
| 514 | diff --git a/io/seek.c b/io/seek.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 515 | index 6734ecb..ffe7439 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 516 | --- a/io/seek.c |
| 517 | +++ b/io/seek.c |
| 518 | @@ -63,8 +63,8 @@ static void |
| 519 | seek_output( |
| 520 | int startflag, |
| 521 | char *type, |
| 522 | - off64_t start, |
| 523 | - off64_t offset) |
| 524 | + off_t start, |
| 525 | + off_t offset) |
| 526 | { |
| 527 | if (offset == -1) { |
| 528 | if (errno == ENXIO) { |
| 529 | @@ -92,7 +92,7 @@ seek_f( |
| 530 | int argc, |
| 531 | char **argv) |
| 532 | { |
| 533 | - off64_t offset, start; |
| 534 | + off_t offset, start; |
| 535 | size_t fsblocksize, fssectsize; |
| 536 | int c; |
| 537 | int current; /* specify data or hole */ |
| 538 | diff --git a/io/sendfile.c b/io/sendfile.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 539 | index a003bb5..2ce569c 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 540 | --- a/io/sendfile.c |
| 541 | +++ b/io/sendfile.c |
| 542 | @@ -34,12 +34,12 @@ sendfile_help(void) |
| 543 | |
| 544 | static int |
| 545 | send_buffer( |
| 546 | - off64_t offset, |
| 547 | + off_t offset, |
| 548 | size_t count, |
| 549 | int fd, |
| 550 | long long *total) |
| 551 | { |
| 552 | - off64_t off = offset; |
| 553 | + off_t off = offset; |
| 554 | ssize_t bytes, bytes_remaining = count; |
| 555 | int ops = 0; |
| 556 | |
| 557 | @@ -66,7 +66,7 @@ sendfile_f( |
| 558 | int argc, |
| 559 | char **argv) |
| 560 | { |
| 561 | - off64_t offset = 0; |
| 562 | + off_t offset = 0; |
| 563 | long long count, total; |
| 564 | size_t blocksize, sectsize; |
| 565 | struct timeval t1, t2; |
| 566 | diff --git a/io/stat.c b/io/stat.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 567 | index b57f9ee..e8f68dc 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 568 | --- a/io/stat.c |
| 569 | +++ b/io/stat.c |
| 570 | @@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; |
| 571 | static cmdinfo_t statfs_cmd; |
| 572 | static cmdinfo_t statx_cmd; |
| 573 | |
| 574 | -off64_t |
| 575 | +off_t |
| 576 | filesize(void) |
| 577 | { |
| 578 | struct stat st; |
| 579 | diff --git a/io/sync_file_range.c b/io/sync_file_range.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 580 | index 94285c2..2375a06 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 581 | --- a/io/sync_file_range.c |
| 582 | +++ b/io/sync_file_range.c |
| 583 | @@ -30,7 +30,7 @@ sync_range_f( |
| 584 | int argc, |
| 585 | char **argv) |
| 586 | { |
| 587 | - off64_t offset = 0, length = 0; |
| 588 | + off_t offset = 0, length = 0; |
| 589 | int c, sync_mode = 0; |
| 590 | size_t blocksize, sectsize; |
| 591 | |
| 592 | diff --git a/io/truncate.c b/io/truncate.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 593 | index 1d04919..a74b613 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 594 | --- a/io/truncate.c |
| 595 | +++ b/io/truncate.c |
| 596 | @@ -16,7 +16,7 @@ truncate_f( |
| 597 | int argc, |
| 598 | char **argv) |
| 599 | { |
| 600 | - off64_t offset; |
| 601 | + off_t offset; |
| 602 | size_t blocksize, sectsize; |
| 603 | |
| 604 | init_cvtnum(&blocksize, §size); |
| 605 | diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 606 | index d5aad3e..0faa05b 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 607 | --- a/libxfs/rdwr.c |
| 608 | +++ b/libxfs/rdwr.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 609 | @@ -576,7 +576,7 @@ libxfs_balloc( |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 610 | |
| 611 | |
| 612 | static int |
| 613 | -__read_buf(int fd, void *buf, int len, off64_t offset, int flags) |
| 614 | +__read_buf(int fd, void *buf, int len, off_t offset, int flags) |
| 615 | { |
| 616 | int sts; |
| 617 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 618 | @@ -639,7 +639,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 619 | fd = libxfs_device_to_fd(btp->bt_bdev); |
| 620 | buf = bp->b_addr; |
| 621 | for (i = 0; i < bp->b_nmaps; i++) { |
| 622 | - off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); |
| 623 | + off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); |
| 624 | int len = BBTOB(bp->b_maps[i].bm_len); |
| 625 | |
| 626 | error = __read_buf(fd, buf, len, offset, flags); |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 627 | @@ -798,7 +798,7 @@ err: |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 628 | } |
| 629 | |
| 630 | static int |
| 631 | -__write_buf(int fd, void *buf, int len, off64_t offset, int flags) |
| 632 | +__write_buf(int fd, void *buf, int len, off_t offset, int flags) |
| 633 | { |
| 634 | int sts; |
| 635 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 636 | @@ -864,7 +864,7 @@ libxfs_bwrite( |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 637 | void *buf = bp->b_addr; |
| 638 | |
| 639 | for (i = 0; i < bp->b_nmaps; i++) { |
| 640 | - off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); |
| 641 | + off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); |
| 642 | int len = BBTOB(bp->b_maps[i].bm_len); |
| 643 | |
| 644 | bp->b_error = __write_buf(fd, buf, len, offset, |
| 645 | diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 646 | index 7c1a66c..bb54e38 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 647 | --- a/mdrestore/xfs_mdrestore.c |
| 648 | +++ b/mdrestore/xfs_mdrestore.c |
| 649 | @@ -116,7 +116,7 @@ perform_restore( |
| 650 | /* ensure device is sufficiently large enough */ |
| 651 | |
| 652 | char *lb[XFS_MAX_SECTORSIZE] = { NULL }; |
| 653 | - off64_t off; |
| 654 | + off_t off; |
| 655 | |
| 656 | off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb); |
| 657 | if (pwrite(dst_fd, lb, sizeof(lb), off) < 0) |
| 658 | diff --git a/repair/prefetch.c b/repair/prefetch.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 659 | index 017750e..35b5013 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 660 | --- a/repair/prefetch.c |
| 661 | +++ b/repair/prefetch.c |
| 662 | @@ -475,7 +475,7 @@ pf_batch_read( |
| 663 | { |
| 664 | struct xfs_buf *bplist[MAX_BUFS]; |
| 665 | unsigned int num; |
| 666 | - off64_t first_off, last_off, next_off; |
| 667 | + off_t first_off, last_off, next_off; |
| 668 | int len, size; |
| 669 | int i; |
| 670 | int inode_bufs; |
| 671 | diff --git a/scrub/spacemap.c b/scrub/spacemap.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 672 | index 03440d3..00bee17 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 673 | --- a/scrub/spacemap.c |
| 674 | +++ b/scrub/spacemap.c |
| 675 | @@ -97,11 +97,11 @@ scan_ag_rmaps( |
| 676 | struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; |
| 677 | struct scan_blocks *sbx = arg; |
| 678 | struct fsmap keys[2]; |
| 679 | - off64_t bperag; |
| 680 | + off_t bperag; |
| 681 | int ret; |
| 682 | |
| 683 | - bperag = (off64_t)ctx->mnt.fsgeom.agblocks * |
| 684 | - (off64_t)ctx->mnt.fsgeom.blocksize; |
| 685 | + bperag = (off_t)ctx->mnt.fsgeom.agblocks * |
| 686 | + (off_t)ctx->mnt.fsgeom.blocksize; |
| 687 | |
| 688 | memset(keys, 0, sizeof(struct fsmap) * 2); |
| 689 | keys->fmr_device = ctx->fsinfo.fs_datadev; |
| 690 | diff --git a/spaceman/freesp.c b/spaceman/freesp.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 691 | index 423568a..df878ce 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 692 | --- a/spaceman/freesp.c |
| 693 | +++ b/spaceman/freesp.c |
| 694 | @@ -62,7 +62,7 @@ static void |
| 695 | addtohist( |
| 696 | xfs_agnumber_t agno, |
| 697 | xfs_agblock_t agbno, |
| 698 | - off64_t len) |
| 699 | + off_t len) |
| 700 | { |
| 701 | long i; |
| 702 | |
| 703 | @@ -152,7 +152,7 @@ scan_ag( |
| 704 | struct fsmap *l, *h; |
| 705 | struct fsmap *p; |
| 706 | struct xfs_fd *xfd = &file->xfd; |
| 707 | - off64_t aglen; |
| 708 | + off_t aglen; |
| 709 | xfs_agblock_t agbno; |
| 710 | unsigned long long freeblks = 0; |
| 711 | unsigned long long freeexts = 0; |
| 712 | diff --git a/spaceman/trim.c b/spaceman/trim.c |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 713 | index e9ed47e..727dd81 100644 |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 714 | --- a/spaceman/trim.c |
| 715 | +++ b/spaceman/trim.c |
| 716 | @@ -26,7 +26,7 @@ trim_f( |
| 717 | struct xfs_fd *xfd = &file->xfd; |
| 718 | struct xfs_fsop_geom *fsgeom = &xfd->fsgeom; |
| 719 | xfs_agnumber_t agno = 0; |
| 720 | - off64_t offset = 0; |
| 721 | + off_t offset = 0; |
| 722 | ssize_t length = 0; |
| 723 | ssize_t minlen = 0; |
| 724 | int aflag = 0; |