btrfs-progs: don't use __u8 for fsid buffers

The underscore types are for ioctl structures and should not be used for
regular code that does not need them.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-10-26 20:44:55 +02:00
parent b1dac5996b
commit cce43f9262
3 changed files with 4 additions and 4 deletions

View File

@ -508,7 +508,7 @@ static int cmp_device_info(const void *a, const void *b)
((struct device_info *)b)->path); ((struct device_info *)b)->path);
} }
int dev_to_fsid(const char *dev, __u8 *fsid) int dev_to_fsid(const char *dev, u8 *fsid)
{ {
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;
char buf[BTRFS_SUPER_INFO_SIZE]; char buf[BTRFS_SUPER_INFO_SIZE];

View File

@ -50,6 +50,6 @@ void print_device_chunks(struct device_info *devinfo,
struct chunk_info *chunks_info_ptr, struct chunk_info *chunks_info_ptr,
int chunks_info_count, unsigned unit_mode); int chunks_info_count, unsigned unit_mode);
void print_device_sizes(struct device_info *devinfo, unsigned unit_mode); void print_device_sizes(struct device_info *devinfo, unsigned unit_mode);
int dev_to_fsid(const char *dev, __u8 *fsid); int dev_to_fsid(const char *dev, u8 *fsid);
#endif #endif

View File

@ -150,7 +150,7 @@ static int cmd_filesystem_df(int argc, char **argv)
return !!ret; return !!ret;
} }
static int match_search_item_kernel(__u8 *fsid, char *mnt, char *label, static int match_search_item_kernel(u8 *fsid, char *mnt, char *label,
char *search) char *search)
{ {
char uuidbuf[BTRFS_UUID_UNPARSED_SIZE]; char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
@ -678,7 +678,7 @@ static int cmd_filesystem_show(int argc, char **argv)
int type = 0; int type = 0;
char mp[PATH_MAX]; char mp[PATH_MAX];
char path[PATH_MAX]; char path[PATH_MAX];
__u8 fsid[BTRFS_FSID_SIZE]; u8 fsid[BTRFS_FSID_SIZE];
char uuid_buf[BTRFS_UUID_UNPARSED_SIZE]; char uuid_buf[BTRFS_UUID_UNPARSED_SIZE];
unsigned unit_mode; unsigned unit_mode;
int found = 0; int found = 0;