From e49cd5358c56593a7923a00706d26dbc4e8bdaed Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sat, 28 Jan 2023 00:16:20 -0800 Subject: [PATCH] usr.sbin/makefs: Sync with sys/vfs/hammer2 Sync with following sys/vfs/hammer2 commits. $ git log --pretty="%h %s" 66f2c621b4a3c452381030521ca3bb6dadfba431.. -- sys/vfs/hammer2/ 1d5238a4ed sys/vfs/hammer2: Fix -Wpointer-sign warnings on hammer2_dirhash() 1b796c7004 sys/vfs/hammer2: Fix -Wpointer-sign warnings --- usr.sbin/makefs/hammer2/hammer2.h | 4 ++-- usr.sbin/makefs/hammer2/hammer2_inode.c | 2 +- usr.sbin/makefs/hammer2/hammer2_subr.c | 3 +-- usr.sbin/makefs/hammer2/hammer2_vfsops.c | 6 +++--- usr.sbin/makefs/hammer2/hammer2_vnops.c | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/usr.sbin/makefs/hammer2/hammer2.h b/usr.sbin/makefs/hammer2/hammer2.h index 57cdec6222..3e66c64db7 100644 --- a/usr.sbin/makefs/hammer2/hammer2.h +++ b/usr.sbin/makefs/hammer2/hammer2.h @@ -1491,7 +1491,7 @@ uint64_t hammer2_timespec_to_time(const struct timespec *ts); uint32_t hammer2_to_unix_xid(const uuid_t *uuid); void hammer2_guid_to_uuid(uuid_t *uuid, uint32_t guid); -hammer2_key_t hammer2_dirhash(const unsigned char *name, size_t len); +hammer2_key_t hammer2_dirhash(const char *aname, size_t len); int hammer2_getradix(size_t bytes); int hammer2_calc_logical(hammer2_inode_t *ip, hammer2_off_t uoff, @@ -1536,7 +1536,7 @@ hammer2_inode_t *hammer2_inode_create_normal(hammer2_inode_t *pip, struct vattr *vap, struct ucred *cred, hammer2_key_t inum, int *errorp); hammer2_inode_t *hammer2_inode_create_pfs(hammer2_pfs_t *spmp, - const uint8_t *name, size_t name_len, + const char *name, size_t name_len, int *errorp); int hammer2_inode_chain_ins(hammer2_inode_t *ip); int hammer2_inode_chain_des(hammer2_inode_t *ip); diff --git a/usr.sbin/makefs/hammer2/hammer2_inode.c b/usr.sbin/makefs/hammer2/hammer2_inode.c index 4a550df9d8..470d15cb75 100644 --- a/usr.sbin/makefs/hammer2/hammer2_inode.c +++ b/usr.sbin/makefs/hammer2/hammer2_inode.c @@ -968,7 +968,7 @@ again: */ hammer2_inode_t * hammer2_inode_create_pfs(hammer2_pfs_t *spmp, - const uint8_t *name, size_t name_len, + const char *name, size_t name_len, int *errorp) { hammer2_xop_create_t *xop; diff --git a/usr.sbin/makefs/hammer2/hammer2_subr.c b/usr.sbin/makefs/hammer2/hammer2_subr.c index 4f19f3ce1f..e49c80a447 100644 --- a/usr.sbin/makefs/hammer2/hammer2_subr.c +++ b/usr.sbin/makefs/hammer2/hammer2_subr.c @@ -179,9 +179,8 @@ hammer2_guid_to_uuid(uuid_t *uuid, uint32_t guid) * Also, the iscsi crc code is used instead of the old crc32 code. */ hammer2_key_t -hammer2_dirhash(const unsigned char *name, size_t len) +hammer2_dirhash(const char *aname, size_t len) { - const unsigned char *aname = name; uint32_t crcx; uint64_t key; size_t i; diff --git a/usr.sbin/makefs/hammer2/hammer2_vfsops.c b/usr.sbin/makefs/hammer2/hammer2_vfsops.c index 542a243b46..67051f8d26 100644 --- a/usr.sbin/makefs/hammer2/hammer2_vfsops.c +++ b/usr.sbin/makefs/hammer2/hammer2_vfsops.c @@ -431,7 +431,7 @@ hammer2_pfsalloc(hammer2_chain_t *chain, sizeof(pmp->pfs_clid)) == 0) { break; } else if (force_local && pmp->pfs_names[0] && - strcmp(pmp->pfs_names[0], ripdata->filename) == 0) { + strcmp(pmp->pfs_names[0], (const char *)ripdata->filename) == 0) { break; } } @@ -521,7 +521,7 @@ hammer2_pfsalloc(hammer2_chain_t *chain, pmp->pfs_types[j] = HAMMER2_PFSTYPE_MASTER; else pmp->pfs_types[j] = ripdata->meta.pfs_type; - pmp->pfs_names[j] = kstrdup(ripdata->filename, M_HAMMER2); + pmp->pfs_names[j] = kstrdup((const char *)ripdata->filename, M_HAMMER2); pmp->pfs_hmps[j] = chain->hmp; hammer2_spin_ex(&pmp->inum_spin); pmp->pfs_iroot_blocksets[j] = chain->data->ipdata.u.blockset; @@ -1356,7 +1356,7 @@ next_hmp: &error, 0); while (chain) { if (chain->bref.type == HAMMER2_BREF_TYPE_INODE && - strcmp(label, chain->data->ipdata.filename) == 0) { + strcmp(label, (char *)chain->data->ipdata.filename) == 0) { break; } chain = hammer2_chain_next(&parent, chain, &key_next, diff --git a/usr.sbin/makefs/hammer2/hammer2_vnops.c b/usr.sbin/makefs/hammer2/hammer2_vnops.c index 700c964321..cd6145c338 100644 --- a/usr.sbin/makefs/hammer2/hammer2_vnops.c +++ b/usr.sbin/makefs/hammer2/hammer2_vnops.c @@ -1565,7 +1565,7 @@ hammer2_vop_nmkdir(struct vop_nmkdir_args *ap) hammer2_inode_t *dip; hammer2_inode_t *nip; struct namecache *ncp; - const uint8_t *name; + const char *name; size_t name_len; hammer2_tid_t inum; int error; @@ -1722,7 +1722,7 @@ hammer2_vop_nlink(struct vop_nlink_args *ap) hammer2_inode_t *tdip; /* target directory to create link in */ hammer2_inode_t *ip; /* inode we are hardlinking to */ struct namecache *ncp; - const uint8_t *name; + const char *name; size_t name_len; int error; uint64_t cmtime; @@ -1838,7 +1838,7 @@ hammer2_vop_ncreate(struct vop_ncreate_args *ap) hammer2_inode_t *dip; hammer2_inode_t *nip; struct namecache *ncp; - const uint8_t *name; + const char *name; size_t name_len; hammer2_tid_t inum; int error; @@ -1948,7 +1948,7 @@ hammer2_vop_nmknod(struct vop_nmknod_args *ap) hammer2_inode_t *dip; hammer2_inode_t *nip; struct namecache *ncp; - const uint8_t *name; + const char *name; size_t name_len; hammer2_tid_t inum; int error; @@ -2054,7 +2054,7 @@ hammer2_vop_nsymlink(struct vop_nsymlink_args *ap) hammer2_inode_t *dip; hammer2_inode_t *nip; struct namecache *ncp; - const uint8_t *name; + const char *name; size_t name_len; hammer2_tid_t inum; int error; @@ -2391,9 +2391,9 @@ hammer2_vop_nrename(struct vop_nrename_args *ap) hammer2_inode_t *ip; /* file being renamed */ hammer2_inode_t *tip; /* replaced target during rename or NULL */ struct m_vnode *vprecycle; - const uint8_t *fname; + const char *fname; size_t fname_len; - const uint8_t *tname; + const char *tname; size_t tname_len; int error; int update_tdip; -- 2.11.4.GIT