Re: git: 831b1ff7913f - main - UFS/FFS: Migrate to modern uintXX_t from u_intXX_t.
- In reply to: Kirk McKusick : "git: 831b1ff7913f - main - UFS/FFS: Migrate to modern uintXX_t from u_intXX_t."
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Jul 2023 22:30:40 UTC
On 27 Jul 2023, at 23:27, Kirk McKusick <mckusick@FreeBSD.org> wrote: > > The branch main has been updated by mckusick: > > URL: https://cgit.FreeBSD.org/src/commit/?id=831b1ff7913fb0b317a258a43dce5abefee03a31 > > commit 831b1ff7913fb0b317a258a43dce5abefee03a31 > Author: Kirk McKusick <mckusick@FreeBSD.org> > AuthorDate: 2023-07-27 22:26:01 +0000 > Commit: Kirk McKusick <mckusick@FreeBSD.org> > CommitDate: 2023-07-27 22:27:36 +0000 > > UFS/FFS: Migrate to modern uintXX_t from u_intXX_t. > > As per https://lists.freebsd.org/archives/freebsd-scsi/2023-July/000257.html > move to the modern uintXX_t. While here also migrate u_char to uint8_t. > Where other kernel interfaces allow, migrate u_long to uint64_t. > > No functional changes intended. > > MFC-after: 1 week > Sponsored-by: The FreeBSD Foundation > --- > sys/ufs/ffs/ffs_alloc.c | 148 +++++++++++++++++++++++---------------------- > sys/ufs/ffs/ffs_extern.h | 19 +++--- > sys/ufs/ffs/ffs_inode.c | 10 +-- > sys/ufs/ffs/ffs_rawread.c | 4 +- > sys/ufs/ffs/ffs_snapshot.c | 10 +-- > sys/ufs/ffs/ffs_softdep.c | 28 ++++----- > sys/ufs/ffs/ffs_subr.c | 30 ++++----- > sys/ufs/ffs/ffs_tables.c | 6 +- > sys/ufs/ffs/ffs_vfsops.c | 25 ++++---- > sys/ufs/ffs/ffs_vnops.c | 33 +++++----- > sys/ufs/ffs/fs.h | 78 ++++++++++++------------ > sys/ufs/ffs/softdep.h | 4 +- > sys/ufs/ufs/dinode.h | 38 ++++++------ > sys/ufs/ufs/dir.h | 28 ++++----- > sys/ufs/ufs/dirhash.h | 2 +- > sys/ufs/ufs/extattr.h | 2 +- > sys/ufs/ufs/inode.h | 20 +++--- > sys/ufs/ufs/quota.h | 46 +++++++------- > sys/ufs/ufs/ufs_dirhash.c | 6 +- > sys/ufs/ufs/ufs_gjournal.c | 6 +- > sys/ufs/ufs/ufs_lookup.c | 19 +++--- > sys/ufs/ufs/ufs_quota.c | 30 ++++----- > sys/ufs/ufs/ufs_vfsops.c | 2 +- > sys/ufs/ufs/ufs_vnops.c | 14 ++--- > sys/ufs/ufs/ufsmount.h | 20 +++--- > 25 files changed, 316 insertions(+), 312 deletions(-) > > diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c > index 680e4685e44a..c5e2a706a128 100644 > --- a/sys/ufs/ffs/ffs_alloc.c > +++ b/sys/ufs/ffs/ffs_alloc.c > @@ -103,10 +103,11 @@ __FBSDID("$FreeBSD$"); > #include <ufs/ffs/ffs_extern.h> > #include <ufs/ffs/softdep.h> > > -typedef ufs2_daddr_t allocfcn_t(struct inode *ip, u_int cg, ufs2_daddr_t bpref, > - int size, int rsize); > +typedef ufs2_daddr_t allocfcn_t(struct inode *ip, uint64_t cg, > + ufs2_daddr_t bpref, int size, int rsize); There are a lot of u_int’s being replaced with uint64_t in this patch, which aren’t equivalent types. Is that intentional? Normally for these patches they should be non-functional, especially when there’s nothing calling out this difference in the commit message. Jess