btrfs-progs: image: pass rb_root to find_collisions

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

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 7174891..c39f2d1 100644 (file)
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -30,98 +30,20 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "ioctl.h"
 #include "utils.h"
 #include "volumes.h"
 #include "commands.h"
 #include "cmds-fi-usage.h"
 #include "list_sort.h"
 #include "disk-io.h"
-#include "cmds-fi-du.h"
+#include "help.h"
 
 /*
  * for btrfs fi show, we maintain a hash of fsids we've already printed.
  * This way we don't print dups if a given FS is mounted more than once.
  */
-#define SEEN_FSID_HASH_SIZE 256
-
-struct seen_fsid {
-       u8 fsid[BTRFS_FSID_SIZE];
-       struct seen_fsid *next;
-};
-
 static struct seen_fsid *seen_fsid_hash[SEEN_FSID_HASH_SIZE] = {NULL,};
 
-static int is_seen_fsid(u8 *fsid)
-{
-       u8 hash = fsid[0];
-       int slot = hash % SEEN_FSID_HASH_SIZE;
-       struct seen_fsid *seen = seen_fsid_hash[slot];
-
-       while (seen) {
-               if (memcmp(seen->fsid, fsid, BTRFS_FSID_SIZE) == 0)
-                       return 1;
-
-               seen = seen->next;
-       }
-
-       return 0;
-}
-
-static int add_seen_fsid(u8 *fsid)
-{
-       u8 hash = fsid[0];
-       int slot = hash % SEEN_FSID_HASH_SIZE;
-       struct seen_fsid *seen = seen_fsid_hash[slot];
-       struct seen_fsid *alloc;
-
-       if (!seen)
-               goto insert;
-
-       while (1) {
-               if (memcmp(seen->fsid, fsid, BTRFS_FSID_SIZE) == 0)
-                       return -EEXIST;
-
-               if (!seen->next)
-                       break;
-
-               seen = seen->next;
-       }
-
-insert:
-
-       alloc = malloc(sizeof(*alloc));
-       if (!alloc)
-               return -ENOMEM;
-
-       alloc->next = NULL;
-       memcpy(alloc->fsid, fsid, BTRFS_FSID_SIZE);
-
-       if (seen)
-               seen->next = alloc;
-       else
-               seen_fsid_hash[slot] = alloc;
-
-       return 0;
-}
-
-static void free_seen_fsid(void)
-{
-       int slot;
-       struct seen_fsid *seen;
-       struct seen_fsid *next;
-
-       for (slot = 0; slot < SEEN_FSID_HASH_SIZE; slot++) {
-               seen = seen_fsid_hash[slot];
-               while (seen) {
-                       next = seen->next;
-                       free(seen);
-                       seen = next;
-               }
-               seen_fsid_hash[slot] = NULL;
-       }
-}
-
 static const char * const filesystem_cmd_group_usage[] = {
        "btrfs filesystem [<group>] <command> [<args>]",
        NULL
@@ -355,7 +277,7 @@ static void print_one_uuid(struct btrfs_fs_devices *fs_devices,
        u64 devs_found = 0;
        u64 total;
 
-       if (add_seen_fsid(fs_devices->fsid))
+       if (add_seen_fsid(fs_devices->fsid, seen_fsid_hash, -1, NULL))
                return;
 
        uuid_unparse(fs_devices->fsid, uuidbuf);
@@ -402,7 +324,7 @@ static int print_one_fs(struct btrfs_ioctl_fs_info_args *fs_info,
        struct btrfs_ioctl_dev_info_args *tmp_dev_info;
        int ret;
 
-       ret = add_seen_fsid(fs_info->fsid);
+       ret = add_seen_fsid(fs_info->fsid, seen_fsid_hash, -1, NULL);
        if (ret == -EEXIST)
                return 0;
        else if (ret)
@@ -474,7 +396,7 @@ static int btrfs_scan_kernel(void *search, unsigned unit_mode)
                        goto out;
 
                /* skip all fs already shown as mounted fs */
-               if (is_seen_fsid(fs_info_arg.fsid))
+               if (is_seen_fsid(fs_info_arg.fsid, seen_fsid_hash))
                        continue;
 
                ret = get_label_mounted(mnt->mnt_dir, label);
@@ -676,7 +598,7 @@ static int search_umounted_fs_uuids(struct list_head *all_uuids,
                }
 
                /* skip all fs already shown as mounted fs */
-               if (is_seen_fsid(cur_fs->fsid))
+               if (is_seen_fsid(cur_fs->fsid, seen_fsid_hash))
                        continue;
 
                fs_copy = calloc(1, sizeof(*fs_copy));
@@ -908,7 +830,7 @@ devs_only:
                free_fs_devices(fs_devices);
        }
 out:
-       free_seen_fsid();
+       free_seen_fsid(seen_fsid_hash);
        return ret;
 }
 
@@ -952,6 +874,8 @@ static int parse_compress_type(char *s)
                return BTRFS_COMPRESS_ZLIB;
        else if (strcmp(optarg, "lzo") == 0)
                return BTRFS_COMPRESS_LZO;
+       else if (strcmp(optarg, "zstd") == 0)
+               return BTRFS_COMPRESS_ZSTD;
        else {
                error("unknown compression type %s", s);
                exit(1);
@@ -962,13 +886,13 @@ static const char * const cmd_filesystem_defrag_usage[] = {
        "btrfs filesystem defragment [options] <file>|<dir> [<file>|<dir>...]",
        "Defragment a file or a directory",
        "",
-       "-v             be verbose",
-       "-r             defragment files recursively",
-       "-c[zlib,lzo]   compress the file while defragmenting",
-       "-f             flush data to disk immediately after defragmenting",
-       "-s start       defragment only from byte onward",
-       "-l len         defragment only up to len bytes",
-       "-t size        target extent size hint (default: 32M)",
+       "-v                  be verbose",
+       "-r                  defragment files recursively",
+       "-c[zlib,lzo,zstd]   compress the file while defragmenting",
+       "-f                  flush data to disk immediately after defragmenting",
+       "-s start            defragment only from byte onward",
+       "-l len              defragment only up to len bytes",
+       "-t size             target extent size hint (default: 32M)",
        NULL
 };