btrfs-progs: add option to disable backtrace usage
[platform/upstream/btrfs-progs.git] / utils.c
diff --git a/utils.c b/utils.c
index 3c74f69..e9306b0 100644 (file)
--- a/utils.c
+++ b/utils.c
 #define BLKDISCARD     _IO(0x12,119)
 #endif
 
-static int
-discard_blocks(int fd, u64 start, u64 len)
+static char argv0_buf[ARGV0_BUF_SIZE] = "btrfs";
+
+void fixup_argv0(char **argv, const char *token)
+{
+       int len = strlen(argv0_buf);
+
+       snprintf(argv0_buf + len, sizeof(argv0_buf) - len, " %s", token);
+       argv[0] = argv0_buf;
+}
+
+void set_argv0(char **argv)
+{
+       sprintf(argv0_buf, "%s", argv[0]);
+}
+
+int check_argc_exact(int nargs, int expected)
+{
+       if (nargs < expected)
+               fprintf(stderr, "%s: too few arguments\n", argv0_buf);
+       if (nargs > expected)
+               fprintf(stderr, "%s: too many arguments\n", argv0_buf);
+
+       return nargs != expected;
+}
+
+int check_argc_min(int nargs, int expected)
+{
+       if (nargs < expected) {
+               fprintf(stderr, "%s: too few arguments\n", argv0_buf);
+               return 1;
+       }
+
+       return 0;
+}
+
+int check_argc_max(int nargs, int expected)
+{
+       if (nargs > expected) {
+               fprintf(stderr, "%s: too many arguments\n", argv0_buf);
+               return 1;
+       }
+
+       return 0;
+}
+
+
+/*
+ * Discard the given range in one go
+ */
+static int discard_range(int fd, u64 start, u64 len)
 {
        u64 range[2] = { start, len };
 
@@ -62,6 +110,26 @@ discard_blocks(int fd, u64 start, u64 len)
        return 0;
 }
 
+/*
+ * Discard blocks in the given range in 1G chunks, the process is interruptible
+ */
+static int discard_blocks(int fd, u64 start, u64 len)
+{
+       while (len > 0) {
+               /* 1G granularity */
+               u64 chunk_size = min_t(u64, len, 1*1024*1024*1024);
+               int ret;
+
+               ret = discard_range(fd, start, chunk_size);
+               if (ret)
+                       return ret;
+               len -= chunk_size;
+               start += chunk_size;
+       }
+
+       return 0;
+}
+
 static u64 reference_root_table[] = {
        [1] =   BTRFS_ROOT_TREE_OBJECTID,
        [2] =   BTRFS_EXTENT_TREE_OBJECTID,
@@ -71,12 +139,41 @@ static u64 reference_root_table[] = {
        [6] =   BTRFS_CSUM_TREE_OBJECTID,
 };
 
-int make_btrfs(int fd, const char *device, const char *label,
+int test_uuid_unique(char *fs_uuid)
+{
+       int unique = 1;
+       blkid_dev_iterate iter = NULL;
+       blkid_dev dev = NULL;
+       blkid_cache cache = NULL;
+
+       if (blkid_get_cache(&cache, 0) < 0) {
+               printf("ERROR: lblkid cache get failed\n");
+               return 1;
+       }
+       blkid_probe_all(cache);
+       iter = blkid_dev_iterate_begin(cache);
+       blkid_dev_set_search(iter, "UUID", fs_uuid);
+
+       while (blkid_dev_next(iter, &dev) == 0) {
+               dev = blkid_verify(cache, dev);
+               if (dev) {
+                       unique = 0;
+                       break;
+               }
+       }
+
+       blkid_dev_iterate_end(iter);
+       blkid_put_cache(cache);
+
+       return unique;
+}
+
+int make_btrfs(int fd, const char *device, const char *label, char *fs_uuid,
               u64 blocks[7], u64 num_bytes, u32 nodesize,
               u32 leafsize, u32 sectorsize, u32 stripesize, u64 features)
 {
        struct btrfs_super_block super;
-       struct extent_buffer *buf;
+       struct extent_buffer *buf = NULL;
        struct btrfs_root_item root_item;
        struct btrfs_disk_key disk_key;
        struct btrfs_extent_item *extent_item;
@@ -103,7 +200,20 @@ int make_btrfs(int fd, const char *device, const char *label,
        memset(&super, 0, sizeof(super));
 
        num_bytes = (num_bytes / sectorsize) * sectorsize;
-       uuid_generate(super.fsid);
+       if (fs_uuid) {
+               if (uuid_parse(fs_uuid, super.fsid) != 0) {
+                       fprintf(stderr, "could not parse UUID: %s\n", fs_uuid);
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if (!test_uuid_unique(fs_uuid)) {
+                       fprintf(stderr, "non-unique UUID: %s\n", fs_uuid);
+                       ret = -EBUSY;
+                       goto out;
+               }
+       } else {
+               uuid_generate(super.fsid);
+       }
        uuid_generate(super.dev_item.uuid);
        uuid_generate(chunk_tree_uuid);
 
@@ -139,7 +249,7 @@ int make_btrfs(int fd, const char *device, const char *label,
        write_extent_buffer(buf, super.fsid, btrfs_header_fsid(),
                            BTRFS_FSID_SIZE);
 
-       write_extent_buffer(buf, chunk_tree_uuid, (unsigned long)
+       write_extent_buffer(buf, chunk_tree_uuid,
                            btrfs_header_chunk_tree_uuid(buf),
                            BTRFS_UUID_SIZE);
 
@@ -475,25 +585,23 @@ static int zero_blocks(int fd, off_t start, size_t len)
        return ret;
 }
 
-static int zero_dev_start(int fd)
+#define ZERO_DEV_BYTES (2 * 1024 * 1024)
+
+/* don't write outside the device by clamping the region to the device size */
+static int zero_dev_clamped(int fd, off_t start, ssize_t len, u64 dev_size)
 {
-       off_t start = 0;
-       size_t len = 2 * 1024 * 1024;
+       off_t end = max(start, start + len);
 
 #ifdef __sparc__
-       /* don't overwrite the disk labels on sparc */
-       start = 1024;
-       len -= 1024;
+       /* and don't overwrite the disk labels on sparc */
+       start = max(start, 1024);
+       end = max(end, 1024);
 #endif
-       return zero_blocks(fd, start, len);
-}
 
-static int zero_dev_end(int fd, u64 dev_size)
-{
-       size_t len = 2 * 1024 * 1024;
-       off_t start = dev_size - len;
+       start = min_t(u64, start, dev_size);
+       end = min_t(u64, end, dev_size);
 
-       return zero_blocks(fd, start, len);
+       return zero_blocks(fd, start, end - start);
 }
 
 int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
@@ -570,33 +678,65 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
        return 0;
 }
 
+static void btrfs_wipe_existing_sb(int fd)
+{
+       const char *off = NULL;
+       size_t len = 0;
+       loff_t offset;
+       char buf[BUFSIZ];
+       int rc = 0;
+       blkid_probe pr = NULL;
+
+       pr = blkid_new_probe();
+       if (!pr)
+               return;
+
+       if (blkid_probe_set_device(pr, fd, 0, 0))
+               goto out;
+
+       rc = blkid_probe_lookup_value(pr, "SBMAGIC_OFFSET", &off, NULL);
+       if (!rc)
+               rc = blkid_probe_lookup_value(pr, "SBMAGIC", NULL, &len);
+
+       if (rc || len == 0 || off == NULL)
+               goto out;
+
+       offset = strtoll(off, NULL, 10);
+       if (len > sizeof(buf))
+               len = sizeof(buf);
+
+       memset(buf, 0, len);
+       rc = pwrite(fd, buf, len, offset);
+       fsync(fd);
+
+out:
+       blkid_free_probe(pr);
+       return;
+}
+
 int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
                           u64 max_block_count, int *mixed, int discard)
 {
        u64 block_count;
-       u64 bytenr;
        struct stat st;
        int i, ret;
 
        ret = fstat(fd, &st);
        if (ret < 0) {
                fprintf(stderr, "unable to stat %s\n", file);
-               exit(1);
+               return 1;
        }
 
        block_count = btrfs_device_size(fd, &st);
        if (block_count == 0) {
                fprintf(stderr, "unable to find %s size\n", file);
-               exit(1);
+               return 1;
        }
        if (max_block_count)
                block_count = min(block_count, max_block_count);
-       zero_end = 1;
 
-       if (block_count < 1024 * 1024 * 1024 && !(*mixed)) {
-               printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
+       if (block_count < BTRFS_MKFS_SMALL_VOLUME_SIZE && !(*mixed))
                *mixed = 1;
-       }
 
        if (discard) {
                /*
@@ -604,33 +744,29 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret,
                 * is not necessary for the mkfs functionality but just an
                 * optimization.
                 */
-               if (discard_blocks(fd, 0, 0) == 0) {
+               if (discard_range(fd, 0, 0) == 0) {
                        fprintf(stderr, "Performing full device TRIM (%s) ...\n",
                                pretty_size(block_count));
                        discard_blocks(fd, 0, block_count);
                }
        }
 
-       ret = zero_dev_start(fd);
-       if (ret) {
-               fprintf(stderr, "failed to zero device start %d\n", ret);
-               exit(1);
-       }
+       ret = zero_dev_clamped(fd, 0, ZERO_DEV_BYTES, block_count);
+       for (i = 0 ; !ret && i < BTRFS_SUPER_MIRROR_MAX; i++)
+               ret = zero_dev_clamped(fd, btrfs_sb_offset(i),
+                                      BTRFS_SUPER_INFO_SIZE, block_count);
+       if (!ret && zero_end)
+               ret = zero_dev_clamped(fd, block_count - ZERO_DEV_BYTES,
+                                      ZERO_DEV_BYTES, block_count);
 
-       for (i = 0 ; i < BTRFS_SUPER_MIRROR_MAX; i++) {
-               bytenr = btrfs_sb_offset(i);
-               if (bytenr >= block_count)
-                       break;
-               zero_blocks(fd, bytenr, BTRFS_SUPER_INFO_SIZE);
+       if (ret < 0) {
+               fprintf(stderr, "ERROR: failed to zero device '%s' - %s\n",
+                       file, strerror(-ret));
+               return 1;
        }
 
-       if (zero_end) {
-               ret = zero_dev_end(fd, block_count);
-               if (ret) {
-                       fprintf(stderr, "failed to zero device end %d\n", ret);
-                       exit(1);
-               }
-       }
+       btrfs_wipe_existing_sb(fd);
+
        *block_count_ret = block_count;
        return 0;
 }
@@ -831,11 +967,11 @@ static int is_same_blk_file(const char* a, const char* b)
        char real_a[PATH_MAX];
        char real_b[PATH_MAX];
 
-       if(!realpath(a, real_a) ||
-          !realpath(b, real_b))
-       {
-               return -errno;
-       }
+       if(!realpath(a, real_a))
+               strcpy(real_a, a);
+
+       if (!realpath(b, real_b))
+               strcpy(real_b, b);
 
        /* Identical path? */
        if(strcmp(real_a, real_b) == 0)
@@ -876,8 +1012,8 @@ static int is_same_loop_file(const char* a, const char* b)
 {
        char res_a[PATH_MAX];
        char res_b[PATH_MAX];
-       const char* final_a;
-       const char* final_b;
+       const char* final_a = NULL;
+       const char* final_b = NULL;
        int ret;
 
        /* Resolve a if it is a loop device */
@@ -886,10 +1022,13 @@ static int is_same_loop_file(const char* a, const char* b)
                        return 0;
                return ret;
        } else if (ret) {
-               if ((ret = resolve_loop_device(a, res_a, sizeof(res_a))) < 0)
-                       return ret;
-
-               final_a = res_a;
+               ret = resolve_loop_device(a, res_a, sizeof(res_a));
+               if (ret < 0) {
+                       if (errno != EPERM)
+                               return ret;
+               } else {
+                       final_a = res_a;
+               }
        } else {
                final_a = a;
        }
@@ -900,10 +1039,13 @@ static int is_same_loop_file(const char* a, const char* b)
                        return 0;
                return ret;
        } else if (ret) {
-               if((ret = resolve_loop_device(b, res_b, sizeof(res_b))) < 0)
-                       return ret;
-
-               final_b = res_b;
+               ret = resolve_loop_device(b, res_b, sizeof(res_b));
+               if (ret < 0) {
+                       if (errno != EPERM)
+                               return ret;
+               } else {
+                       final_b = res_b;
+               }
        } else {
                final_b = b;
        }
@@ -949,6 +1091,64 @@ static int blk_file_in_dev_list(struct btrfs_fs_devices* fs_devices,
 }
 
 /*
+ * Resolve a pathname to a device mapper node to /dev/mapper/<name>
+ * Returns NULL on invalid input or malloc failure; Other failures
+ * will be handled by the caller using the input pathame.
+ */
+char *canonicalize_dm_name(const char *ptname)
+{
+       FILE    *f;
+       size_t  sz;
+       char    path[PATH_MAX], name[PATH_MAX], *res = NULL;
+
+       if (!ptname || !*ptname)
+               return NULL;
+
+       snprintf(path, sizeof(path), "/sys/block/%s/dm/name", ptname);
+       if (!(f = fopen(path, "r")))
+               return NULL;
+
+       /* read <name>\n from sysfs */
+       if (fgets(name, sizeof(name), f) && (sz = strlen(name)) > 1) {
+               name[sz - 1] = '\0';
+               snprintf(path, sizeof(path), "/dev/mapper/%s", name);
+
+               if (access(path, F_OK) == 0)
+                       res = strdup(path);
+       }
+       fclose(f);
+       return res;
+}
+
+/*
+ * Resolve a pathname to a canonical device node, e.g. /dev/sda1 or
+ * to a device mapper pathname.
+ * Returns NULL on invalid input or malloc failure; Other failures
+ * will be handled by the caller using the input pathame.
+ */
+char *canonicalize_path(const char *path)
+{
+       char *canonical, *p;
+
+       if (!path || !*path)
+               return NULL;
+
+       canonical = realpath(path, NULL);
+       if (!canonical)
+               return strdup(path);
+       p = strrchr(canonical, '/');
+       if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) {
+               char *dm = canonicalize_dm_name(p + 1);
+
+               if (dm) {
+                       free(canonical);
+                       return dm;
+               }
+       }
+       return canonical;
+}
+
+/*
  * returns 1 if the device was mounted, < 0 on error or 0 if everything
  * is safe to continue.
  */
@@ -981,17 +1181,18 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
 
        /* scan the initial device */
        ret = btrfs_scan_one_device(fd, file, &fs_devices_mnt,
-                                   &total_devs, BTRFS_SUPER_INFO_OFFSET);
+                                   &total_devs, BTRFS_SUPER_INFO_OFFSET, 0);
        is_btrfs = (ret >= 0);
 
        /* scan other devices */
        if (is_btrfs && total_devs > 1) {
-               if ((ret = btrfs_scan_for_fsid(!BTRFS_UPDATE_KERNEL)))
+               ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL);
+               if (ret)
                        return ret;
        }
 
        /* iterate over the list of currently mountes filesystems */
-       if ((f = setmntent ("/proc/mounts", "r")) == NULL)
+       if ((f = setmntent ("/proc/self/mounts", "r")) == NULL)
                return -errno;
 
        while ((mnt = getmntent (f)) != NULL) {
@@ -1063,127 +1264,6 @@ void btrfs_register_one_device(char *fname)
        close(fd);
 }
 
-int btrfs_scan_one_dir(char *dirname, int run_ioctl)
-{
-       DIR *dirp = NULL;
-       struct dirent *dirent;
-       struct pending_dir *pending;
-       struct stat st;
-       int ret;
-       int fd;
-       int dirname_len;
-       char *fullpath;
-       struct list_head pending_list;
-       struct btrfs_fs_devices *tmp_devices;
-       u64 num_devices;
-
-       INIT_LIST_HEAD(&pending_list);
-
-       pending = malloc(sizeof(*pending));
-       if (!pending)
-               return -ENOMEM;
-       strcpy(pending->name, dirname);
-
-again:
-       dirname_len = strlen(pending->name);
-       fullpath = malloc(PATH_MAX);
-       dirname = pending->name;
-
-       if (!fullpath) {
-               ret = -ENOMEM;
-               goto fail;
-       }
-       dirp = opendir(dirname);
-       if (!dirp) {
-               fprintf(stderr, "Unable to open %s for scanning\n", dirname);
-               ret = -ENOENT;
-               goto fail;
-       }
-       while(1) {
-               dirent = readdir(dirp);
-               if (!dirent)
-                       break;
-               if (dirent->d_name[0] == '.')
-                       continue;
-               if (dirname_len + strlen(dirent->d_name) + 2 > PATH_MAX) {
-                       ret = -EFAULT;
-                       goto fail;
-               }
-               snprintf(fullpath, PATH_MAX, "%s/%s", dirname, dirent->d_name);
-               ret = lstat(fullpath, &st);
-               if (ret < 0) {
-                       fprintf(stderr, "failed to stat %s\n", fullpath);
-                       continue;
-               }
-               if (S_ISLNK(st.st_mode))
-                       continue;
-               if (S_ISDIR(st.st_mode)) {
-                       struct pending_dir *next = malloc(sizeof(*next));
-                       if (!next) {
-                               ret = -ENOMEM;
-                               goto fail;
-                       }
-                       strcpy(next->name, fullpath);
-                       list_add_tail(&next->list, &pending_list);
-               }
-               if (!S_ISBLK(st.st_mode)) {
-                       continue;
-               }
-               fd = open(fullpath, O_RDONLY);
-               if (fd < 0) {
-                       /* ignore the following errors:
-                               ENXIO (device don't exists) 
-                               ENOMEDIUM (No medium found -> 
-                                       like a cd tray empty)
-                       */
-                       if(errno != ENXIO && errno != ENOMEDIUM) 
-                               fprintf(stderr, "failed to read %s: %s\n", 
-                                       fullpath, strerror(errno));
-                       continue;
-               }
-               ret = btrfs_scan_one_device(fd, fullpath, &tmp_devices,
-                                           &num_devices,
-                                           BTRFS_SUPER_INFO_OFFSET);
-               if (ret == 0 && run_ioctl > 0) {
-                       btrfs_register_one_device(fullpath);
-               }
-               close(fd);
-       }
-       if (!list_empty(&pending_list)) {
-               free(pending);
-               pending = list_entry(pending_list.next, struct pending_dir,
-                                    list);
-               free(fullpath);
-               list_del(&pending->list);
-               closedir(dirp);
-               dirp = NULL;
-               goto again;
-       }
-       ret = 0;
-fail:
-       free(pending);
-       free(fullpath);
-       while (!list_empty(&pending_list)) {
-               pending = list_entry(pending_list.next, struct pending_dir,
-                                    list);
-               list_del(&pending->list);
-               free(pending);
-       }
-       if (dirp)
-               closedir(dirp);
-       return ret;
-}
-
-int btrfs_scan_for_fsid(int run_ioctls)
-{
-       int ret;
-
-       ret = scan_for_btrfs(BTRFS_SCAN_PROC, run_ioctls);
-       if (ret)
-               ret = scan_for_btrfs(BTRFS_SCAN_DEV, run_ioctls);
-       return ret;
-}
-
 int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
                                 int super_offset)
 {
@@ -1324,7 +1404,7 @@ static int set_label_mounted(const char *mount_path, const char *label)
 
        fd = open(mount_path, O_RDONLY | O_NOATIME);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
+               fprintf(stderr, "ERROR: unable to access '%s'\n", mount_path);
                return -1;
        }
 
@@ -1339,7 +1419,7 @@ static int set_label_mounted(const char *mount_path, const char *label)
        return 0;
 }
 
-static int get_label_unmounted(const char *dev)
+static int get_label_unmounted(const char *dev, char *label)
 {
        struct btrfs_root *root;
        int ret;
@@ -1362,7 +1442,7 @@ static int get_label_unmounted(const char *dev)
        if(!root)
                return -1;
 
-       fprintf(stdout, "%s\n", root->fs_info->super_copy->label);
+       memcpy(label, root->fs_info->super_copy->label, BTRFS_LABEL_SIZE);
 
        /* Now we close it since we are done. */
        close_ctree(root);
@@ -1381,7 +1461,7 @@ int get_label_mounted(const char *mount_path, char *labelp)
 
        fd = open(mount_path, O_RDONLY | O_NOATIME);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: unable access to '%s'\n", mount_path);
+               fprintf(stderr, "ERROR: unable to access '%s'\n", mount_path);
                return -1;
        }
 
@@ -1397,29 +1477,33 @@ int get_label_mounted(const char *mount_path, char *labelp)
        return 0;
 }
 
-int get_label(const char *btrfs_dev)
+int get_label(const char *btrfs_dev, char *label)
 {
        int ret;
-       char label[BTRFS_LABEL_SIZE];
 
-       if (is_existing_blk_or_reg_file(btrfs_dev))
-               ret = get_label_unmounted(btrfs_dev);
-       else {
+       ret = is_existing_blk_or_reg_file(btrfs_dev);
+       if (!ret)
                ret = get_label_mounted(btrfs_dev, label);
-               if (!ret)
-                       fprintf(stdout, "%s\n", label);
-       }
+       else if (ret > 0)
+               ret = get_label_unmounted(btrfs_dev, label);
+
        return ret;
 }
 
 int set_label(const char *btrfs_dev, const char *label)
 {
+       int ret;
+
        if (check_label(label))
                return -1;
 
-       return is_existing_blk_or_reg_file(btrfs_dev) ?
-               set_label_unmounted(btrfs_dev, label) :
-               set_label_mounted(btrfs_dev, label);
+       ret = is_existing_blk_or_reg_file(btrfs_dev);
+       if (!ret)
+               ret = set_label_mounted(btrfs_dev, label);
+       else if (ret > 0)
+               ret = set_label_unmounted(btrfs_dev, label);
+
+       return ret;
 }
 
 int btrfs_scan_block_devices(int run_ioctl)
@@ -1489,7 +1573,7 @@ scan_again:
                }
                ret = btrfs_scan_one_device(fd, fullpath, &tmp_devices,
                                            &num_devices,
-                                           BTRFS_SUPER_INFO_OFFSET);
+                                           BTRFS_SUPER_INFO_OFFSET, 0);
                if (ret == 0 && run_ioctl > 0) {
                        btrfs_register_one_device(fullpath);
                }
@@ -1505,51 +1589,95 @@ scan_again:
        return 0;
 }
 
-u64 parse_size(char *s)
+/*
+ * A not-so-good version fls64. No fascinating optimization since
+ * no one except parse_size use it
+ */
+static int fls64(u64 x)
 {
        int i;
+
+       for (i = 0; i <64; i++)
+               if (x << i & (1ULL << 63))
+                       return 64 - i;
+       return 64 - i;
+}
+
+u64 parse_size(char *s)
+{
        char c;
+       char *endptr;
        u64 mult = 1;
+       u64 ret;
 
-       for (i = 0; s && s[i] && isdigit(s[i]); i++) ;
-       if (!i) {
-               fprintf(stderr, "ERROR: size value is empty\n");
-               exit(50);
+       if (!s) {
+               fprintf(stderr, "ERROR: Size value is empty\n");
+               exit(1);
        }
-
-       if (s[i]) {
-               c = tolower(s[i]);
+       if (s[0] == '-') {
+               fprintf(stderr,
+                       "ERROR: Size value '%s' is less equal than 0\n", s);
+               exit(1);
+       }
+       ret = strtoull(s, &endptr, 10);
+       if (endptr == s) {
+               fprintf(stderr, "ERROR: Size value '%s' is invalid\n", s);
+               exit(1);
+       }
+       if (endptr[0] && endptr[1]) {
+               fprintf(stderr, "ERROR: Illegal suffix contains character '%c' in wrong position\n",
+                       endptr[1]);
+               exit(1);
+       }
+       /*
+        * strtoll returns LLONG_MAX when overflow, if this happens,
+        * need to call strtoull to get the real size
+        */
+       if (errno == ERANGE && ret == ULLONG_MAX) {
+               fprintf(stderr,
+                       "ERROR: Size value '%s' is too large for u64\n", s);
+               exit(1);
+       }
+       if (endptr[0]) {
+               c = tolower(endptr[0]);
                switch (c) {
                case 'e':
                        mult *= 1024;
+                       /* fallthrough */
                case 'p':
                        mult *= 1024;
+                       /* fallthrough */
                case 't':
                        mult *= 1024;
+                       /* fallthrough */
                case 'g':
                        mult *= 1024;
+                       /* fallthrough */
                case 'm':
                        mult *= 1024;
+                       /* fallthrough */
                case 'k':
                        mult *= 1024;
+                       /* fallthrough */
                case 'b':
                        break;
                default:
-                       fprintf(stderr, "ERROR: Unknown size descriptor "
-                               "'%c'\n", c);
+                       fprintf(stderr, "ERROR: Unknown size descriptor '%c'\n",
+                               c);
                        exit(1);
                }
        }
-       if (s[i] && s[i+1]) {
-               fprintf(stderr, "ERROR: Illegal suffix contains "
-                       "character '%c' in wrong position\n",
-                       s[i+1]);
-               exit(51);
+       /* Check whether ret * mult overflow */
+       if (fls64(ret) + fls64(mult) - 1 > 64) {
+               fprintf(stderr,
+                       "ERROR: Size value '%s' is too large for u64\n", s);
+               exit(1);
        }
-       return strtoull(s, NULL, 10) * mult;
+       ret *= mult;
+       return ret;
 }
 
-int open_file_or_dir(const char *fname, DIR **dirstream)
+int open_file_or_dir3(const char *fname, DIR **dirstream, int open_flags)
 {
        int ret;
        struct stat st;
@@ -1562,19 +1690,31 @@ int open_file_or_dir(const char *fname, DIR **dirstream)
        if (S_ISDIR(st.st_mode)) {
                *dirstream = opendir(fname);
                if (!*dirstream)
-                       return -2;
+                       return -1;
                fd = dirfd(*dirstream);
+       } else if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
+               fd = open(fname, open_flags);
        } else {
-               fd = open(fname, O_RDWR);
+               /*
+                * we set this on purpose, in case the caller output
+                * strerror(errno) as success
+                */
+               errno = EINVAL;
+               return -1;
        }
        if (fd < 0) {
-               fd = -3;
+               fd = -1;
                if (*dirstream)
                        closedir(*dirstream);
        }
        return fd;
 }
 
+int open_file_or_dir(const char *fname, DIR **dirstream)
+{
+       return open_file_or_dir3(fname, dirstream, O_RDWR);
+}
+
 void close_file_or_dir(int fd, DIR *dirstream)
 {
        if (dirstream)
@@ -1583,7 +1723,7 @@ void close_file_or_dir(int fd, DIR *dirstream)
                close(fd);
 }
 
-static int get_device_info(int fd, u64 devid,
+int get_device_info(int fd, u64 devid,
                struct btrfs_ioctl_dev_info_args *di_args)
 {
        int ret;
@@ -1611,7 +1751,7 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
        int fd = -1;
        int ret = 0;
        int ndevs = 0;
-       int i = 1;
+       int i = 0;
        struct btrfs_fs_devices *fs_devices_mnt = NULL;
        struct btrfs_ioctl_dev_info_args *di_args;
        char mp[BTRFS_PATH_NAME_MAX + 1];
@@ -1620,6 +1760,10 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
        memset(fi_args, 0, sizeof(*fi_args));
 
        if (is_block_device(path)) {
+               struct btrfs_super_block *disk_super;
+               char buf[BTRFS_SUPER_INFO_SIZE];
+               u64 devid;
+
                /* Ensure it's mounted, then set path to the mountpoint */
                fd = open(path, O_RDONLY);
                if (fd < 0) {
@@ -1639,8 +1783,19 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
                path = mp;
                /* Only fill in this one device */
                fi_args->num_devices = 1;
-               fi_args->max_id = fs_devices_mnt->latest_devid;
-               i = fs_devices_mnt->latest_devid;
+
+               disk_super = (struct btrfs_super_block *)buf;
+               ret = btrfs_read_dev_super(fd, disk_super,
+                                          BTRFS_SUPER_INFO_OFFSET, 0);
+               if (ret < 0) {
+                       ret = -EIO;
+                       goto out;
+               }
+               devid = btrfs_stack_device_id(&disk_super->dev_item);
+
+               fi_args->max_id = devid;
+               i = devid;
+
                memcpy(fi_args->fsid, fs_devices_mnt->fsid, BTRFS_FSID_SIZE);
                close(fd);
        }
@@ -1680,8 +1835,15 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
                ndevs++;
        }
 
-       BUG_ON(ndevs == 0);
-       ret = 0;
+       /*
+       * only when the only dev we wanted to find is not there then
+       * let any error be returned
+       */
+       if (fi_args->num_devices != 1) {
+               BUG_ON(ndevs == 0);
+               ret = 0;
+       }
+
 out:
        close_file_or_dir(fd, dirstream);
        return ret;
@@ -1942,24 +2104,10 @@ int test_dev_for_mkfs(char *file, int force_overwrite, char *estr)
        return 0;
 }
 
-int test_skip_this_disk(char *path)
-{
-       int fd;
-
-       /*
-        * this will eliminate disks which are mounted (btrfs)
-        * and non-dm disk path when dm is enabled
-        */
-       fd = open(path, O_RDWR|O_EXCL);
-       if (fd < 0)
-               return 1;
-       close(fd);
-       return 0;
-}
-
 int btrfs_scan_lblkid(int update_kernel)
 {
        int fd = -1;
+       int ret;
        u64 num_devices;
        struct btrfs_fs_devices *tmp_devices;
        blkid_dev_iterate iter = NULL;
@@ -1980,45 +2128,29 @@ int btrfs_scan_lblkid(int update_kernel)
                        continue;
                /* if we are here its definitely a btrfs disk*/
                strncpy(path, blkid_dev_devname(dev), PATH_MAX);
-               if (test_skip_this_disk(path))
-                       continue;
 
                fd = open(path, O_RDONLY);
                if (fd < 0) {
                        printf("ERROR: could not open %s\n", path);
                        continue;
                }
-               btrfs_scan_one_device(fd, path, &tmp_devices,
-                               &num_devices, BTRFS_SUPER_INFO_OFFSET);
+               ret = btrfs_scan_one_device(fd, path, &tmp_devices,
+                               &num_devices, BTRFS_SUPER_INFO_OFFSET, 0);
+               if (ret) {
+                       printf("ERROR: could not scan %s\n", path);
+                       close (fd);
+                       continue;
+               }
+
                close(fd);
                if (update_kernel)
                        btrfs_register_one_device(path);
        }
        blkid_dev_iterate_end(iter);
+       blkid_put_cache(cache);
        return 0;
 }
 
-/*
- * scans devs for the btrfs
-*/
-int scan_for_btrfs(int where, int update_kernel)
-{
-       int ret = 0;
-
-       switch (where) {
-       case BTRFS_SCAN_PROC:
-               ret = btrfs_scan_block_devices(update_kernel);
-               break;
-       case BTRFS_SCAN_DEV:
-               ret = btrfs_scan_one_dir("/dev", update_kernel);
-               break;
-       case BTRFS_SCAN_LBLKID:
-               ret = btrfs_scan_lblkid(update_kernel);
-               break;
-       }
-       return ret;
-}
-
 int is_vol_small(char *file)
 {
        int fd = -1;
@@ -2039,7 +2171,7 @@ int is_vol_small(char *file)
                close(fd);
                return -1;
        }
-       if (size < 1024 * 1024 * 1024) {
+       if (size < BTRFS_MKFS_SMALL_VOLUME_SIZE) {
                close(fd);
                return 1;
        } else {
@@ -2069,7 +2201,7 @@ int ask_user(char *question)
 /*
  * For a given:
  * - file or directory return the containing tree root id
- * - subvolume return it's own tree id
+ * - subvolume return its own tree id
  * - BTRFS_EMPTY_SUBVOL_DIR_OBJECTID (directory with ino == 2) the result is
  *   undefined and function returns -1
  */
@@ -2095,3 +2227,109 @@ int lookup_ino_rootid(int fd, u64 *rootid)
 
        return 0;
 }
+
+/*
+ * return 0 if a btrfs mount point is found
+ * return 1 if a mount point is found but not btrfs
+ * return <0 if something goes wrong
+ */
+int find_mount_root(const char *path, char **mount_root)
+{
+       FILE *mnttab;
+       int fd;
+       struct mntent *ent;
+       int len;
+       int ret;
+       int not_btrfs = 1;
+       int longest_matchlen = 0;
+       char *longest_match = NULL;
+
+       fd = open(path, O_RDONLY | O_NOATIME);
+       if (fd < 0)
+               return -errno;
+       close(fd);
+
+       mnttab = setmntent("/proc/self/mounts", "r");
+       if (!mnttab)
+               return -errno;
+
+       while ((ent = getmntent(mnttab))) {
+               len = strlen(ent->mnt_dir);
+               if (strncmp(ent->mnt_dir, path, len) == 0) {
+                       /* match found and use the latest match */
+                       if (longest_matchlen <= len) {
+                               free(longest_match);
+                               longest_matchlen = len;
+                               longest_match = strdup(ent->mnt_dir);
+                               not_btrfs = strcmp(ent->mnt_type, "btrfs");
+                       }
+               }
+       }
+       endmntent(mnttab);
+
+       if (!longest_match)
+               return -ENOENT;
+       if (not_btrfs) {
+               free(longest_match);
+               return 1;
+       }
+
+       ret = 0;
+       *mount_root = realpath(longest_match, NULL);
+       if (!*mount_root)
+               ret = -errno;
+
+       free(longest_match);
+       return ret;
+}
+
+int test_minimum_size(const char *file, u32 leafsize)
+{
+       int fd;
+       struct stat statbuf;
+
+       fd = open(file, O_RDONLY);
+       if (fd < 0)
+               return -errno;
+       if (stat(file, &statbuf) < 0) {
+               close(fd);
+               return -errno;
+       }
+       if (btrfs_device_size(fd, &statbuf) < btrfs_min_dev_size(leafsize)) {
+               close(fd);
+               return 1;
+       }
+       close(fd);
+       return 0;
+}
+
+/*
+ * test if name is a correct subvolume name
+ * this function return
+ * 0-> name is not a correct subvolume name
+ * 1-> name is a correct subvolume name
+ */
+int test_issubvolname(const char *name)
+{
+       return name[0] != '\0' && !strchr(name, '/') &&
+               strcmp(name, ".") && strcmp(name, "..");
+}
+
+/*
+ * test if path is a directory
+ * this function return
+ * 0-> path exists but it is not a directory
+ * 1-> path exists and it is a directory
+ * -1 -> path is unaccessible
+ */
+int test_isdir(const char *path)
+{
+       struct stat st;
+       int ret;
+
+       ret = stat(path, &st);
+       if(ret < 0 )
+               return -1;
+
+       return S_ISDIR(st.st_mode);
+}