btrfs-progs: fsck-tests: Introduce test case with keyed data backref with the extent...

[platform/upstream/btrfs-progs.git] / cmds-fi-usage.c

diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c
index 83d0c58..de7ad66 100644 (file)
--- a/cmds-fi-usage.c
+++ b/cmds-fi-usage.c
@@ -164,8 +164,7 @@ static int load_chunk_info(int fd, struct chunk_info **info_ptr, int *info_count
                        return -e;
 
                if (ret < 0) {
-                       error("cannot look up chunk tree info: %s",
-                               strerror(e));
+                       error("cannot look up chunk tree info: %m");
                        return 1;
                }
                /* the ioctl returns the number of item it found in nr_items */
@@ -244,8 +243,7 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path)
 
        ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs);
        if (ret < 0) {
-               error("cannot get space info on '%s': %s", path,
-                       strerror(errno));
+               error("cannot get space info on '%s': %m", path);
                free(sargs);
                return NULL;
        }
@@ -270,8 +268,8 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path)
 
        ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs);
        if (ret < 0) {
-               error("cannot get space info with %u slots: %s",
-                       count, strerror(errno));
+               error("cannot get space info with %u slots: %m",
+                       count);
                free(sargs);
                return NULL;
        }
@@ -356,8 +354,7 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
        }
 
        if (r_total_size == 0) {
-               error("cannot get space info on '%s': %s",
-                       path, strerror(errno));
+               error("cannot get space info on '%s': %m", path);
 
                ret = 1;
                goto exit;
@@ -508,7 +505,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];
@@ -554,8 +551,7 @@ static int load_device_info(int fd, struct device_info **device_info_ptr,
        if (ret < 0) {
                if (errno == EPERM)
                        return -errno;
-               error("cannot get filesystem info: %s",
-                               strerror(errno));
+               error("cannot get filesystem info: %m");
                return 1;
        }