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