c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

libbtrfsutil: use packed struct based unaligned access for search header accessors

Browse source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2024-05-29 21:45:54 +02:00
parent 94e058d8b2
commit 06c7012a54
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libbtrfsutil/btrfsutil_internal.h
View file

@ -64,41 +64,31 @@ static inline __u64 get_unaligned_le64(const void *ptr)
/*
* Accessors of search header that is commonly mapped to a byte buffer so the
* alignment is not guraranteed
* alignment is not guaranteed. This is always CPU order.
*/
static inline __u64 btrfs_search_header_transid(const struct btrfs_ioctl_search_header *sh)
{
__u64 tmp;
memcpy(&tmp, &sh->transid, sizeof(__u64));
return tmp;
return ((const struct __unagligned_u64 *)(const void *)(&sh->transid))->x;
}
static inline __u64 btrfs_search_header_objectid(const struct btrfs_ioctl_search_header *sh)
{
__u64 tmp;
memcpy(&tmp, &sh->objectid, sizeof(__u64));
return tmp;
return ((const struct __unagligned_u64 *)(const void *)(&sh->objectid))->x;
}
static inline __u64 btrfs_search_header_offset(const struct btrfs_ioctl_search_header *sh)
{
__u64 tmp;
memcpy(&tmp, &sh->offset, sizeof(__u64));
return tmp;
return ((const struct __unagligned_u64 *)(const void *)(&sh->offset))->x;
}
static inline __u32 btrfs_search_header_type(const struct btrfs_ioctl_search_header *sh)
{
__u32 tmp;
memcpy(&tmp, &sh->type, sizeof(__u32));
return tmp;
return ((const struct __unagligned_u32 *)(const void *)(&sh->type))->x;
}
static inline __u32 btrfs_search_header_len(const struct btrfs_ioctl_search_header *sh)
{
__u32 tmp;
memcpy(&tmp, &sh->len, sizeof(__u32));
return tmp;
return ((const struct __unagligned_u32 *)(const void *)(&sh->len))->x;
}
#endif /* BTRFS_UTIL_INTERNAL_H */