From 96dc2e6f42981ed21a281f193acd91138c4206d1 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Tue, 8 Nov 2016 00:12:54 +0900 Subject: [PATCH] sys/vfs/hammer: Use HAMMER_BUFSIZE_DOALIGN() and variants This should have been in bbc5e78b (failed to catch these). --- sys/vfs/hammer/hammer_object.c | 3 +-- sys/vfs/hammer/hammer_ondisk.c | 3 +-- sys/vfs/hammer/hammer_vnops.c | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/vfs/hammer/hammer_object.c b/sys/vfs/hammer/hammer_object.c index a81abeb30b..bc82b38ec4 100644 --- a/sys/vfs/hammer/hammer_object.c +++ b/sys/vfs/hammer/hammer_object.c @@ -1186,8 +1186,7 @@ hammer_ip_sync_record_cursor(hammer_cursor_t cursor, hammer_record_t record) if (record->type == HAMMER_MEM_RECORD_DATA && hammer_record_needs_overwrite_delete(record)) { file_offset = record->leaf.base.key - record->leaf.data_len; - bytes = (record->leaf.data_len + HAMMER_BUFMASK) & - ~HAMMER_BUFMASK; + bytes = HAMMER_BUFSIZE_DOALIGN(record->leaf.data_len); KKASSERT((file_offset & HAMMER_BUFMASK) == 0); error = hammer_ip_delete_range( cursor, record->ip, diff --git a/sys/vfs/hammer/hammer_ondisk.c b/sys/vfs/hammer/hammer_ondisk.c index 5e759d89d1..83db7bc6f9 100644 --- a/sys/vfs/hammer/hammer_ondisk.c +++ b/sys/vfs/hammer/hammer_ondisk.c @@ -1657,8 +1657,7 @@ hammer_alloc_data(hammer_transaction_t trans, int32_t data_len, zone = hammer_data_zone_index(data_len); if (zone == HAMMER_ZONE_LARGE_DATA_INDEX) { /* round up */ - data_len = (data_len + HAMMER_BUFMASK) & - ~HAMMER_BUFMASK; + data_len = HAMMER_BUFSIZE_DOALIGN(data_len); } break; default: diff --git a/sys/vfs/hammer/hammer_vnops.c b/sys/vfs/hammer/hammer_vnops.c index 55549fbc39..45b8b411d9 100644 --- a/sys/vfs/hammer/hammer_vnops.c +++ b/sys/vfs/hammer/hammer_vnops.c @@ -1055,11 +1055,9 @@ hammer_vop_getattr(struct vop_getattr_args *ap) vap->va_gen = 1; /* hammer inums are unique for all time */ vap->va_blocksize = HAMMER_BUFSIZE; if (ip->ino_data.size >= HAMMER_XDEMARC) { - vap->va_bytes = (ip->ino_data.size + HAMMER_XBUFMASK64) & - ~HAMMER_XBUFMASK64; + vap->va_bytes = HAMMER_XBUFSIZE64_DOALIGN(ip->ino_data.size); } else if (ip->ino_data.size > HAMMER_HBUFSIZE) { - vap->va_bytes = (ip->ino_data.size + HAMMER_BUFMASK64) & - ~HAMMER_BUFMASK64; + vap->va_bytes = HAMMER_BUFSIZE64_DOALIGN(ip->ino_data.size); } else { vap->va_bytes = HAMMER_DATA_DOALIGN(ip->ino_data.size); } -- 2.41.0