From cce43f926200febfd8dedd60b774b32e540ab761 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 26 Oct 2017 20:44:55 +0200 Subject: 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 --- cmds-fi-usage.c | 2 +- cmds-fi-usage.h | 2 +- cmds-filesystem.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c index 83d0c589..0b0e47fe 100644 --- a/cmds-fi-usage.c +++ b/cmds-fi-usage.c @@ -508,7 +508,7 @@ static int cmp_device_info(const void *a, const void *b) ((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; char buf[BTRFS_SUPER_INFO_SIZE]; diff --git a/cmds-fi-usage.h b/cmds-fi-usage.h index 0e82951e..cab38462 100644 --- a/cmds-fi-usage.h +++ b/cmds-fi-usage.h @@ -50,6 +50,6 @@ void print_device_chunks(struct device_info *devinfo, struct chunk_info *chunks_info_ptr, int chunks_info_count, 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 diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 0f8e6cdc..7728430f 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -150,7 +150,7 @@ static int cmd_filesystem_df(int argc, char **argv) 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 uuidbuf[BTRFS_UUID_UNPARSED_SIZE]; @@ -678,7 +678,7 @@ static int cmd_filesystem_show(int argc, char **argv) int type = 0; char mp[PATH_MAX]; char path[PATH_MAX]; - __u8 fsid[BTRFS_FSID_SIZE]; + u8 fsid[BTRFS_FSID_SIZE]; char uuid_buf[BTRFS_UUID_UNPARSED_SIZE]; unsigned unit_mode; int found = 0; -- cgit v1.2.3