From 9be1b0c77afd935ea1e16400d86ee504c084ff74 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 6 Mar 2023 00:16:39 -0800 Subject: [PATCH] Revert "sys/vfs/hammer2: Avoid void* pointer arithmetic" This reverts commit 3f53c53686fc9e236fb9949c8d2a665ce27832be. Unlike makefs' buf::b_data in DragonFly (until 02f727fe249ae3252e4721f806f49ded0544938e), the kernel buf::b_data in DragonFly has always been of caddr_t, so explicit cast was never needed. --- sys/vfs/hammer2/hammer2_io.c | 2 +- sys/vfs/hammer2/hammer2_ondisk.c | 6 +++--- sys/vfs/hammer2/hammer2_strategy.c | 8 ++++---- sys/vfs/hammer2/hammer2_vnops.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/vfs/hammer2/hammer2_io.c b/sys/vfs/hammer2/hammer2_io.c index 1af5021b09..68a47162fb 100644 --- a/sys/vfs/hammer2/hammer2_io.c +++ b/sys/vfs/hammer2/hammer2_io.c @@ -667,7 +667,7 @@ hammer2_io_data(hammer2_io_t *dio, off_t lbase) lbase -= dio->dbase; off = (lbase & ~HAMMER2_OFF_MASK_RADIX) - bp->b_loffset; KKASSERT(off >= 0 && off < bp->b_bufsize); - return((char *)bp->b_data + off); + return(bp->b_data + off); } int diff --git a/sys/vfs/hammer2/hammer2_ondisk.c b/sys/vfs/hammer2/hammer2_ondisk.c index e984c36f7a..fcd60f694b 100644 --- a/sys/vfs/hammer2/hammer2_ondisk.c +++ b/sys/vfs/hammer2/hammer2_ondisk.c @@ -516,7 +516,7 @@ hammer2_read_volume_header(struct vnode *devvp, const char *path, /* verify volume header CRC's */ crc0 = vd->icrc_sects[HAMMER2_VOL_ICRC_SECT0]; - crc1 = hammer2_icrc32((char *)bp->b_data + HAMMER2_VOLUME_ICRC0_OFF, + crc1 = hammer2_icrc32(bp->b_data + HAMMER2_VOLUME_ICRC0_OFF, HAMMER2_VOLUME_ICRC0_SIZE); if (crc0 != crc1) { hprintf("%s #%d: volume header crc mismatch sect0 %08x/%08x\n", @@ -526,7 +526,7 @@ hammer2_read_volume_header(struct vnode *devvp, const char *path, continue; } crc0 = vd->icrc_sects[HAMMER2_VOL_ICRC_SECT1]; - crc1 = hammer2_icrc32((char *)bp->b_data + HAMMER2_VOLUME_ICRC1_OFF, + crc1 = hammer2_icrc32(bp->b_data + HAMMER2_VOLUME_ICRC1_OFF, HAMMER2_VOLUME_ICRC1_SIZE); if (crc0 != crc1) { hprintf("%s #%d: volume header crc mismatch sect1 %08x/%08x\n", @@ -536,7 +536,7 @@ hammer2_read_volume_header(struct vnode *devvp, const char *path, continue; } crc0 = vd->icrc_volheader; - crc1 = hammer2_icrc32((char *)bp->b_data + HAMMER2_VOLUME_ICRCVH_OFF, + crc1 = hammer2_icrc32(bp->b_data + HAMMER2_VOLUME_ICRCVH_OFF, HAMMER2_VOLUME_ICRCVH_SIZE); if (crc0 != crc1) { hprintf("%s #%d: volume header crc mismatch vh %08x/%08x\n", diff --git a/sys/vfs/hammer2/hammer2_strategy.c b/sys/vfs/hammer2/hammer2_strategy.c index 526fd3c665..ca2b9d5824 100644 --- a/sys/vfs/hammer2/hammer2_strategy.c +++ b/sys/vfs/hammer2/hammer2_strategy.c @@ -178,7 +178,7 @@ hammer2_decompress_LZ4_callback(const char *data, u_int bytes, struct bio *bio) KKASSERT(result <= bp->b_bufsize); bcopy(compressed_buffer, bp->b_data, bp->b_bufsize); if (result < bp->b_bufsize) - bzero((char *)bp->b_data + result, bp->b_bufsize - result); + bzero(bp->b_data + result, bp->b_bufsize - result); objcache_put(cache_buffer_read, compressed_buffer); bp->b_resid = 0; bp->b_flags |= B_AGE; @@ -226,7 +226,7 @@ hammer2_decompress_ZLIB_callback(const char *data, u_int bytes, struct bio *bio) bcopy(compressed_buffer, bp->b_data, bp->b_bufsize); result = bp->b_bufsize - strm_decompress.avail_out; if (result < bp->b_bufsize) - bzero((char *)bp->b_data + result, strm_decompress.avail_out); + bzero(bp->b_data + result, strm_decompress.avail_out); objcache_put(cache_buffer_read, compressed_buffer); ret = inflateEnd(&strm_decompress); @@ -415,7 +415,7 @@ hammer2_strategy_read_completion(hammer2_chain_t *focus, const char *data, */ bcopy(((const hammer2_inode_data_t *)data)->u.data, bp->b_data, HAMMER2_EMBEDDED_BYTES); - bzero((char *)bp->b_data + HAMMER2_EMBEDDED_BYTES, + bzero(bp->b_data + HAMMER2_EMBEDDED_BYTES, bp->b_bcount - HAMMER2_EMBEDDED_BYTES); bp->b_resid = 0; bp->b_error = 0; @@ -452,7 +452,7 @@ hammer2_strategy_read_completion(hammer2_chain_t *focus, const char *data, KKASSERT(focus->bytes <= bp->b_bcount); bcopy(data, bp->b_data, focus->bytes); if (focus->bytes < bp->b_bcount) { - bzero((char *)bp->b_data + focus->bytes, + bzero(bp->b_data + focus->bytes, bp->b_bcount - focus->bytes); } bp->b_resid = 0; diff --git a/sys/vfs/hammer2/hammer2_vnops.c b/sys/vfs/hammer2/hammer2_vnops.c index 60310019b4..b88bc0a942 100644 --- a/sys/vfs/hammer2/hammer2_vnops.c +++ b/sys/vfs/hammer2/hammer2_vnops.c @@ -1121,7 +1121,7 @@ hammer2_write_file(hammer2_inode_t *ip, struct uio *uio, * Ok, copy the data in */ bkvasync(bp); - error = uiomovebp(bp, (char *)bp->b_data + loff, n, uio); + error = uiomovebp(bp, bp->b_data + loff, n, uio); kflags |= NOTE_WRITE; modified = 1; if (error) { -- 2.11.4.GIT