forked from Mirrors/btrfs-progs
btrfs-progs: pass whole key to btrfs_uuid_to_key
Switch the function to take a key instead of objectid and offset separately, gcc 9 complains with enabled -Waddress-of-packed-member: [CC] ctree.o ctree.c: In function ‘btrfs_uuid_tree_lookup’: ctree.c:3133:26: error: taking address of packed member of ‘struct btrfs_key’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 3133 | btrfs_uuid_to_key(uuid, &key.objectid, &key.offset); Signed-off-by: David Sterba <dsterba@suse.com>master
parent
781e36a784
commit
1d4796978c
4
ctree.c
4
ctree.c
|
@ -3130,7 +3130,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, u8 *uuid,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
btrfs_uuid_to_key(uuid, &key.objectid, &key.offset);
|
btrfs_uuid_to_key(uuid, &key);
|
||||||
key.type = type;
|
key.type = type;
|
||||||
ret = btrfs_search_slot(NULL, uuid_root, &key, path, 0, 0);
|
ret = btrfs_search_slot(NULL, uuid_root, &key, path, 0, 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -3191,7 +3191,7 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
key.type = type;
|
key.type = type;
|
||||||
btrfs_uuid_to_key(uuid, &key.objectid, &key.offset);
|
btrfs_uuid_to_key(uuid, &key);
|
||||||
|
|
||||||
path = btrfs_alloc_path();
|
path = btrfs_alloc_path();
|
||||||
if (!path) {
|
if (!path) {
|
||||||
|
|
2
ctree.h
2
ctree.h
|
@ -2773,7 +2773,7 @@ static inline int is_fstree(u64 rootid)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void btrfs_uuid_to_key(const u8 *uuid, u64 *key_objectid, u64 *key_offset);
|
void btrfs_uuid_to_key(const u8 *uuid, struct btrfs_key *key);
|
||||||
|
|
||||||
/* inode.c */
|
/* inode.c */
|
||||||
int check_dir_conflict(struct btrfs_root *root, char *name, int namelen,
|
int check_dir_conflict(struct btrfs_root *root, char *name, int namelen,
|
||||||
|
|
28
uuid-tree.c
28
uuid-tree.c
|
@ -25,10 +25,14 @@
|
||||||
#include "print-tree.h"
|
#include "print-tree.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
void btrfs_uuid_to_key(const u8 *uuid, u64 *key_objectid, u64 *key_offset)
|
void btrfs_uuid_to_key(const u8 *uuid, struct btrfs_key *key)
|
||||||
{
|
{
|
||||||
*key_objectid = get_unaligned_le64(uuid);
|
u64 tmp;
|
||||||
*key_offset = get_unaligned_le64(uuid + sizeof(u64));
|
|
||||||
|
tmp = get_unaligned_le64(uuid);
|
||||||
|
put_unaligned_64(tmp, &key->objectid);
|
||||||
|
tmp = get_unaligned_le64(uuid + sizeof(u64));
|
||||||
|
put_unaligned_64(tmp, &key->offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -40,31 +44,31 @@ static int btrfs_uuid_tree_lookup_any(int fd, const u8 *uuid, u8 type,
|
||||||
u64 *subid)
|
u64 *subid)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
u64 key_objectid = 0;
|
|
||||||
u64 key_offset;
|
|
||||||
struct btrfs_ioctl_search_args search_arg;
|
struct btrfs_ioctl_search_args search_arg;
|
||||||
struct btrfs_ioctl_search_header *search_header;
|
struct btrfs_ioctl_search_header *search_header;
|
||||||
u32 item_size;
|
u32 item_size;
|
||||||
__le64 lesubid;
|
__le64 lesubid;
|
||||||
|
struct btrfs_key key;
|
||||||
|
|
||||||
btrfs_uuid_to_key(uuid, &key_objectid, &key_offset);
|
key.type = type;
|
||||||
|
btrfs_uuid_to_key(uuid, &key);
|
||||||
|
|
||||||
memset(&search_arg, 0, sizeof(search_arg));
|
memset(&search_arg, 0, sizeof(search_arg));
|
||||||
search_arg.key.tree_id = BTRFS_UUID_TREE_OBJECTID;
|
search_arg.key.tree_id = BTRFS_UUID_TREE_OBJECTID;
|
||||||
search_arg.key.min_objectid = key_objectid;
|
search_arg.key.min_objectid = key.objectid;
|
||||||
search_arg.key.max_objectid = key_objectid;
|
search_arg.key.max_objectid = key.objectid;
|
||||||
search_arg.key.min_type = type;
|
search_arg.key.min_type = type;
|
||||||
search_arg.key.max_type = type;
|
search_arg.key.max_type = type;
|
||||||
search_arg.key.min_offset = key_offset;
|
search_arg.key.min_offset = key.offset;
|
||||||
search_arg.key.max_offset = key_offset;
|
search_arg.key.max_offset = key.offset;
|
||||||
search_arg.key.max_transid = (u64)-1;
|
search_arg.key.max_transid = (u64)-1;
|
||||||
search_arg.key.nr_items = 1;
|
search_arg.key.nr_items = 1;
|
||||||
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &search_arg);
|
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &search_arg);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"ioctl(BTRFS_IOC_TREE_SEARCH, uuid, key %016llx, UUID_KEY, %016llx) ret=%d, error: %m\n",
|
"ioctl(BTRFS_IOC_TREE_SEARCH, uuid, key %016llx, UUID_KEY, %016llx) ret=%d, error: %m\n",
|
||||||
(unsigned long long)key_objectid,
|
(unsigned long long)key.objectid,
|
||||||
(unsigned long long)key_offset, ret);
|
(unsigned long long)key.offset, ret);
|
||||||
ret = -ENOENT;
|
ret = -ENOENT;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue