diff options
| author | David Sterba <dsterba@suse.com> | 2016-10-31 12:33:28 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-11-09 13:47:29 +0100 |
| commit | 65b2f81d77c0b1ed57d6e9f033f618f7b3fe83b8 (patch) | |
| tree | e22874f53a2239f962a2b16ec43704bdc9f92fea /btrfs-list.c | |
| parent | e573142d3744c07a052fe03c44de613db879996d (diff) | |
btrfs-progs: subvol list: consolidate uuid types accross functions
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'btrfs-list.c')
| -rw-r--r-- | btrfs-list.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/btrfs-list.c b/btrfs-list.c index b93a5be2..ae798d34 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -394,7 +394,7 @@ static struct root_info *root_tree_search(struct root_lookup *root_tree, static int update_root(struct root_lookup *root_lookup, u64 root_id, u64 ref_tree, u64 root_offset, u64 flags, u64 dir_id, char *name, int name_len, u64 ogen, u64 gen, - time_t otime, void *uuid, void *puuid, void *ruuid) + time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid) { struct root_info *ri; @@ -457,7 +457,7 @@ static int update_root(struct root_lookup *root_lookup, static int add_root(struct root_lookup *root_lookup, u64 root_id, u64 ref_tree, u64 root_offset, u64 flags, u64 dir_id, char *name, int name_len, u64 ogen, u64 gen, - time_t otime, void *uuid, void *puuid, void *ruuid) + time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid) { struct root_info *ri; int ret; @@ -982,9 +982,6 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup) u64 ogen; u64 flags; int i; - u8 uuid[BTRFS_UUID_SIZE]; - u8 puuid[BTRFS_UUID_SIZE]; - u8 ruuid[BTRFS_UUID_SIZE]; root_lookup_init(root_lookup); memset(&args, 0, sizeof(args)); @@ -1026,6 +1023,9 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup) name_len); } else if (sh.type == BTRFS_ROOT_ITEM_KEY) { time_t otime; + u8 uuid[BTRFS_UUID_SIZE]; + u8 puuid[BTRFS_UUID_SIZE]; + u8 ruuid[BTRFS_UUID_SIZE]; ri = (struct btrfs_root_item *)(args.buf + off); gen = btrfs_root_generation(ri); |