From 689a9368eb60f061e10e1924f388b99e8f6c2cb2 Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Wed, 9 Nov 2022 18:30:25 -0800 Subject: [PATCH] Fix types for fsck_ffs(8) i386 build. Reported by: jenkins Reported by: Cy Schubert Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsck.h | 4 ++-- sbin/fsck_ffs/fsutil.c | 2 +- sbin/fsck_ffs/inode.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index a00fedd9ef90..7e714d8d7085 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -469,7 +469,7 @@ int ckinode(union dinode *dp, struct inodesc *); void clri(struct inodesc *, const char *type, int flag); int clearentry(struct inodesc *); void copyonwrite(struct fs *, struct bufarea *, - ufs2_daddr_t (*checkblkavail)(long, long)); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); void direrror(ino_t ino, const char *errmesg); int dirscan(struct inodesc *); int dofix(struct inodesc *, const char *msg); @@ -525,7 +525,7 @@ int setup(char *dev); int snapblkfree(struct fs *, ufs2_daddr_t, long, ino_t, ufs2_daddr_t (*)(ufs2_daddr_t, long)); void snapremove(ino_t); -void snapflush(ufs2_daddr_t (*checkblkavail)(long, long)); +void snapflush(ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); ufs2_daddr_t std_checkblkavail(ufs2_daddr_t blkno, long frags); ufs2_daddr_t suj_checkblkavail(ufs2_daddr_t, long); int suj_check(const char *filesys); diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 5be058dc40c2..7a8dc68cac89 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -522,7 +522,7 @@ flush(int fd, struct bufarea *bp) * the snapshots, no further snapshot copies will need to be done. */ void -snapflush(ufs2_daddr_t (*checkblkavail)(long, long)) +snapflush(ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)) { struct bufarea *bp; int cnt; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 1d36a6ca3e45..85fa6ae8ec1d 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -61,7 +61,7 @@ static ufs2_daddr_t indir_blkatoff(ufs2_daddr_t, ino_t, ufs_lbn_t, ufs_lbn_t, struct bufarea **); static int snapclean(struct inodesc *idesc); static void chkcopyonwrite(struct fs *, ufs2_daddr_t, - ufs2_daddr_t (*checkblkavail)(long, long)); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); int ckinode(union dinode *dp, struct inodesc *idesc) @@ -804,7 +804,7 @@ snapblkfree(fs, bno, size, inum, checkblkavail) ufs2_daddr_t bno; long size; ino_t inum; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { union dinode *dp; struct inode ip; @@ -934,7 +934,7 @@ void copyonwrite(fs, bp, checkblkavail) struct fs *fs; struct bufarea *bp; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { ufs2_daddr_t copyblkno; long i, numblks; @@ -957,7 +957,7 @@ static void chkcopyonwrite(fs, copyblkno, checkblkavail) struct fs *fs; ufs2_daddr_t copyblkno; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { struct inode ip; union dinode *dp;