btrfs-progs: Remove deprecated btrfs-calc-size tool
[platform/upstream/btrfs-progs.git] / cmds-subvolume.c
index c40330a..45363a5 100644 (file)
@@ -14,6 +14,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <sys/vfs.h>
 #include <libgen.h>
 #include <limits.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
+#include <linux/magic.h>
+
+#include <btrfsutil.h>
 
 #include "kerncompat.h"
 #include "ioctl.h"
 #include "utils.h"
 #include "btrfs-list.h"
 #include "utils.h"
+#include "help.h"
 
-static int is_subvolume_cleaned(int fd, u64 subvolid)
+static int wait_for_subvolume_cleaning(int fd, size_t count, uint64_t *ids,
+                                      int sleep_interval)
 {
-       int ret;
-       struct btrfs_ioctl_search_args args;
-       struct btrfs_ioctl_search_key *sk = &args.key;
-
-       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
-       sk->min_objectid = subvolid;
-       sk->max_objectid = subvolid;
-       sk->min_type = BTRFS_ROOT_ITEM_KEY;
-       sk->max_type = BTRFS_ROOT_ITEM_KEY;
-       sk->min_offset = 0;
-       sk->max_offset = (u64)-1;
-       sk->min_transid = 0;
-       sk->max_transid = (u64)-1;
-       sk->nr_items = 1;
-
-       ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-       if (ret < 0)
-               return -errno;
-
-       if (sk->nr_items == 0)
-               return 1;
-
-       return 0;
-}
-
-static int wait_for_subvolume_cleaning(int fd, int count, u64 *ids,
-               int sleep_interval)
-{
-       int ret;
-       int i;
+       size_t i;
+       enum btrfs_util_error err;
 
        while (1) {
                int clean = 1;
@@ -75,16 +54,14 @@ static int wait_for_subvolume_cleaning(int fd, int count, u64 *ids,
                for (i = 0; i < count; i++) {
                        if (!ids[i])
                                continue;
-                       ret = is_subvolume_cleaned(fd, ids[i]);
-                       if (ret < 0) {
-                               fprintf(stderr,
-                                       "ERROR: can't perform the search - %s\n",
-                                       strerror(-ret));
-                               return ret;
-                       }
-                       if (ret) {
-                               printf("Subvolume id %llu is gone\n", ids[i]);
+                       err = btrfs_util_subvolume_info_fd(fd, ids[i], NULL);
+                       if (err == BTRFS_UTIL_ERROR_SUBVOLUME_NOT_FOUND) {
+                               printf("Subvolume id %" PRIu64 " is gone\n",
+                                      ids[i]);
                                ids[i] = 0;
+                       } else if (err) {
+                               error_btrfs_util(err);
+                               return -errno;
                        } else {
                                clean = 0;
                        }
@@ -125,9 +102,8 @@ static int cmd_subvol_create(int argc, char **argv)
        struct btrfs_qgroup_inherit *inherit = NULL;
        DIR     *dirstream = NULL;
 
-       optind = 1;
        while (1) {
-               int c = getopt(argc, argv, "c:i:v");
+               int c = getopt(argc, argv, "c:i:");
                if (c < 0)
                        break;
 
@@ -158,8 +134,12 @@ static int cmd_subvol_create(int argc, char **argv)
 
        retval = 1;     /* failure */
        res = test_isdir(dst);
+       if (res < 0 && res != -ENOENT) {
+               error("cannot access %s: %s", dst, strerror(-res));
+               goto out;
+       }
        if (res >= 0) {
-               fprintf(stderr, "ERROR: '%s' exists\n", dst);
+               error("target path already exists: %s", dst);
                goto out;
        }
 
@@ -169,23 +149,19 @@ static int cmd_subvol_create(int argc, char **argv)
        dstdir = dirname(dupdir);
 
        if (!test_issubvolname(newname)) {
-               fprintf(stderr, "ERROR: incorrect subvolume name '%s'\n",
-                       newname);
+               error("invalid subvolume name: %s", newname);
                goto out;
        }
 
        len = strlen(newname);
        if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
-               fprintf(stderr, "ERROR: subvolume name too long '%s'\n",
-                       newname);
+               error("subvolume name too long: %s", newname);
                goto out;
        }
 
-       fddst = open_file_or_dir(dstdir, &dirstream);
-       if (fddst < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+       fddst = btrfs_open_dir(dstdir, &dirstream, 1);
+       if (fddst < 0)
                goto out;
-       }
 
        printf("Create subvolume '%s/%s'\n", dstdir, newname);
        if (inherit) {
@@ -208,8 +184,7 @@ static int cmd_subvol_create(int argc, char **argv)
        }
 
        if (res < 0) {
-               fprintf(stderr, "ERROR: cannot create subvolume - %s\n",
-                       strerror(errno));
+               error("cannot create subvolume: %m");
                goto out;
        }
 
@@ -223,33 +198,20 @@ out:
        return retval;
 }
 
-/*
- * test if path is a subvolume:
- * this function return
- * 0-> path exists but it is not a subvolume
- * 1-> path exists and it is  a subvolume
- * -1 -> path is unaccessible
- */
-int test_issubvolume(char *path)
+static int wait_for_commit(int fd)
 {
-       struct stat     st;
-       int             res;
+       enum btrfs_util_error err;
+       uint64_t transid;
 
-       res = stat(path, &st);
-       if(res < 0 )
+       err = btrfs_util_start_sync_fd(fd, &transid);
+       if (err)
                return -1;
 
-       return (st.st_ino == 256) && S_ISDIR(st.st_mode);
-}
-
-static int wait_for_commit(int fd)
-{
-       int ret;
+       err = btrfs_util_wait_sync_fd(fd, transid);
+       if (err)
+               return -1;
 
-       ret = ioctl(fd, BTRFS_IOC_START_SYNC, NULL);
-       if (ret < 0)
-               return ret;
-       return ioctl(fd, BTRFS_IOC_WAIT_SYNC, NULL);
+       return 0;
 }
 
 static const char * const cmd_subvol_delete_usage[] = {
@@ -264,15 +226,15 @@ static const char * const cmd_subvol_delete_usage[] = {
        "",
        "-c|--commit-after      wait for transaction commit at the end of the operation",
        "-C|--commit-each       wait for transaction commit after deleting each subvolume",
+       "-v|--verbose           verbose output of operations",
        NULL
 };
 
 static int cmd_subvol_delete(int argc, char **argv)
 {
-       int     res, e, ret = 0;
+       int res, ret = 0;
        int cnt;
        int fd = -1;
-       struct btrfs_ioctl_vol_args     args;
        char    *dname, *vname, *cpath;
        char    *dupdname = NULL;
        char    *dupvname = NULL;
@@ -280,26 +242,31 @@ static int cmd_subvol_delete(int argc, char **argv)
        DIR     *dirstream = NULL;
        int verbose = 0;
        int commit_mode = 0;
+       u8 fsid[BTRFS_FSID_SIZE];
+       char uuidbuf[BTRFS_UUID_UNPARSED_SIZE];
+       struct seen_fsid *seen_fsid_hash[SEEN_FSID_HASH_SIZE] = { NULL, };
+       enum { COMMIT_AFTER = 1, COMMIT_EACH = 2 };
+       enum btrfs_util_error err;
 
-       optind = 1;
        while (1) {
                int c;
                static const struct option long_options[] = {
-                       {"commit-after", no_argument, NULL, 'c'},  /* commit mode 1 */
-                       {"commit-each", no_argument, NULL, 'C'},  /* commit mode 2 */
+                       {"commit-after", no_argument, NULL, 'c'},
+                       {"commit-each", no_argument, NULL, 'C'},
+                       {"verbose", no_argument, NULL, 'v'},
                        {NULL, 0, NULL, 0}
                };
 
-               c = getopt_long(argc, argv, "cC", long_options, NULL);
+               c = getopt_long(argc, argv, "cCv", long_options, NULL);
                if (c < 0)
                        break;
 
                switch(c) {
                case 'c':
-                       commit_mode = 1;
+                       commit_mode = COMMIT_AFTER;
                        break;
                case 'C':
-                       commit_mode = 2;
+                       commit_mode = COMMIT_EACH;
                        break;
                case 'v':
                        verbose++;
@@ -315,7 +282,7 @@ static int cmd_subvol_delete(int argc, char **argv)
        if (verbose > 0) {
                printf("Transaction commit: %s\n",
                        !commit_mode ? "none (default)" :
-                       commit_mode == 1 ? "at the end" : "after each");
+                       commit_mode == COMMIT_AFTER ? "at the end" : "after each");
        }
 
        cnt = optind;
@@ -323,14 +290,9 @@ static int cmd_subvol_delete(int argc, char **argv)
 again:
        path = argv[cnt];
 
-       res = test_issubvolume(path);
-       if (res < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", path);
-               ret = 1;
-               goto out;
-       }
-       if (!res) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", path);
+       err = btrfs_util_is_subvolume(path);
+       if (err) {
+               error_btrfs_util(err);
                ret = 1;
                goto out;
        }
@@ -338,8 +300,7 @@ again:
        cpath = realpath(path, NULL);
        if (!cpath) {
                ret = errno;
-               fprintf(stderr, "ERROR: finding real path for '%s': %s\n",
-                       path, strerror(errno));
+               error("cannot find real path for '%s': %m", path);
                goto out;
        }
        dupdname = strdup(cpath);
@@ -348,62 +309,97 @@ again:
        vname = basename(dupvname);
        free(cpath);
 
-       fd = open_file_or_dir(dname, &dirstream);
+       fd = btrfs_open_dir(dname, &dirstream, 1);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", dname);
                ret = 1;
                goto out;
        }
 
        printf("Delete subvolume (%s): '%s/%s'\n",
-               commit_mode == 2 || (commit_mode == 1 && cnt + 1 == argc)
+               commit_mode == COMMIT_EACH || (commit_mode == COMMIT_AFTER && cnt + 1 == argc)
                ? "commit" : "no-commit", dname, vname);
-       memset(&args, 0, sizeof(args));
-       strncpy_null(args.name, vname);
-       res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
-       e = errno;
 
-       if(res < 0 ){
-               fprintf( stderr, "ERROR: cannot delete '%s/%s' - %s\n",
-                       dname, vname, strerror(e));
+       err = btrfs_util_delete_subvolume_fd(fd, vname, 0);
+       if (err) {
+               error_btrfs_util(err);
                ret = 1;
                goto out;
        }
 
-       if (commit_mode == 1) {
+       if (commit_mode == COMMIT_EACH) {
                res = wait_for_commit(fd);
                if (res < 0) {
-                       fprintf(stderr,
-                               "ERROR: unable to wait for commit after '%s': %s\n",
-                               path, strerror(errno));
+                       error("unable to wait for commit after '%s': %m", path);
                        ret = 1;
                }
+       } else if (commit_mode == COMMIT_AFTER) {
+               res = get_fsid(dname, fsid, 0);
+               if (res < 0) {
+                       error("unable to get fsid for '%s': %s",
+                               path, strerror(-res));
+                       error(
+                       "delete succeeded but commit may not be done in the end");
+                       ret = 1;
+                       goto out;
+               }
+
+               if (add_seen_fsid(fsid, seen_fsid_hash, fd, dirstream) == 0) {
+                       if (verbose > 0) {
+                               uuid_unparse(fsid, uuidbuf);
+                               printf("  new fs is found for '%s', fsid: %s\n",
+                                               path, uuidbuf);
+                       }
+                       /*
+                        * This is the first time a subvolume on this
+                        * filesystem is deleted, keep fd in order to issue
+                        * SYNC ioctl in the end
+                        */
+                       goto keep_fd;
+               }
        }
 
 out:
+       close_file_or_dir(fd, dirstream);
+keep_fd:
+       fd = -1;
+       dirstream = NULL;
        free(dupdname);
        free(dupvname);
        dupdname = NULL;
        dupvname = NULL;
        cnt++;
-       if (cnt < argc) {
-               close_file_or_dir(fd, dirstream);
-               /* avoid double free */
-               fd = -1;
-               dirstream = NULL;
+       if (cnt < argc)
                goto again;
-       }
 
-       if (commit_mode == 2 && fd != -1) {
-               res = wait_for_commit(fd);
-               if (res < 0) {
-                       fprintf(stderr,
-                               "ERROR: unable to do final sync: %s\n",
-                               strerror(errno));
-                       ret = 1;
+       if (commit_mode == COMMIT_AFTER) {
+               int slot;
+
+               /*
+                * Traverse seen_fsid_hash and issue SYNC ioctl on each
+                * filesystem
+                */
+               for (slot = 0; slot < SEEN_FSID_HASH_SIZE; slot++) {
+                       struct seen_fsid *seen = seen_fsid_hash[slot];
+
+                       while (seen) {
+                               res = wait_for_commit(seen->fd);
+                               if (res < 0) {
+                                       uuid_unparse(seen->fsid, uuidbuf);
+                                       error(
+                       "unable to do final sync after deletion: %m, fsid: %s",
+                                               uuidbuf);
+                                       ret = 1;
+                               } else if (verbose > 0) {
+                                       uuid_unparse(seen->fsid, uuidbuf);
+                                       printf("final sync is done for fsid: %s\n",
+                                               uuidbuf);
+                               }
+                               seen = seen->next;
+                       }
                }
+               /* fd will also be closed in free_seen_fsid */
+               free_seen_fsid(seen_fsid_hash);
        }
-       close_file_or_dir(fd, dirstream);
 
        return ret;
 }
@@ -414,24 +410,32 @@ out:
  * - lowercase for enabling specific items in the output
  */
 static const char * const cmd_subvol_list_usage[] = {
-       "btrfs subvolume list [options] [-G [+|-]value] [-C [+|-]value] "
-       "[--sort=gen,ogen,rootid,path] <path>",
-       "List subvolumes (and snapshots)",
+       "btrfs subvolume list [options] <path>",
+       "List subvolumes and snapshots in the filesystem.",
        "",
-       "-p           print parent ID",
+       "Path filtering:",
+       "-o           print only subvolumes below specified path",
        "-a           print all the subvolumes in the filesystem and",
        "             distinguish absolute and relative path with respect",
        "             to the given <path>",
+       "",
+       "Field selection:",
+       "-p           print parent ID",
        "-c           print the ogeneration of the subvolume",
        "-g           print the generation of the subvolume",
-       "-o           print only subvolumes below specified path",
        "-u           print the uuid of subvolumes (and snapshots)",
        "-q           print the parent uuid of the snapshots",
        "-R           print the uuid of the received snapshots",
-       "-t           print the result as a table",
-       "-s           list snapshots only in the filesystem",
+       "",
+       "Type filtering:",
+       "-s           list only snapshots",
        "-r           list readonly subvolumes (including snapshots)",
        "-d           list deleted subvolumes that are not yet cleaned",
+       "",
+       "Other:",
+       "-t           print the result as a table",
+       "",
+       "Sorting:",
        "-G [+|-]value",
        "             filter the subvolumes by generation",
        "             (+value: >= value; -value: <= value; value: = value)",
@@ -454,15 +458,14 @@ static int cmd_subvol_list(int argc, char **argv)
        u64 top_id;
        int ret = -1, uerr = 0;
        char *subvol;
-       int is_tab_result = 0;
        int is_list_all = 0;
        int is_only_in_path = 0;
        DIR *dirstream = NULL;
+       enum btrfs_list_layout layout = BTRFS_LIST_LAYOUT_DEFAULT;
 
        filter_set = btrfs_list_alloc_filter_set();
        comparer_set = btrfs_list_alloc_comparer_set();
 
-       optind = 1;
        while(1) {
                int c;
                static const struct option long_options[] = {
@@ -497,7 +500,7 @@ static int cmd_subvol_list(int argc, char **argv)
                        is_only_in_path = 1;
                        break;
                case 't':
-                       is_tab_result = 1;
+                       layout = BTRFS_LIST_LAYOUT_TABLE;
                        break;
                case 's':
                        btrfs_list_setup_filter(&filter_set,
@@ -554,28 +557,26 @@ static int cmd_subvol_list(int argc, char **argv)
                }
        }
 
-       if (flags)
-               btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_FLAGS,
-                                       flags);
-
        if (check_argc_exact(argc - optind, 1)) {
                uerr = 1;
                goto out;
        }
 
        subvol = argv[optind];
-       fd = open_file_or_dir(subvol, &dirstream);
+       fd = btrfs_open_dir(subvol, &dirstream, 1);
        if (fd < 0) {
                ret = -1;
-               fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
+               error("can't access '%s'", subvol);
                goto out;
        }
 
+       if (flags)
+               btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_FLAGS,
+                                       flags);
+
        ret = btrfs_list_get_path_rootid(fd, &top_id);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't get rootid for '%s'\n", subvol);
+       if (ret)
                goto out;
-       }
 
        if (is_list_all)
                btrfs_list_setup_filter(&filter_set,
@@ -592,21 +593,15 @@ static int cmd_subvol_list(int argc, char **argv)
        btrfs_list_setup_print_column(BTRFS_LIST_TOP_LEVEL);
        btrfs_list_setup_print_column(BTRFS_LIST_PATH);
 
-       if (is_tab_result)
-               ret = btrfs_list_subvols_print(fd, filter_set, comparer_set,
-                               BTRFS_LIST_LAYOUT_TABLE,
-                               !is_list_all && !is_only_in_path, NULL);
-       else
-               ret = btrfs_list_subvols_print(fd, filter_set, comparer_set,
-                               BTRFS_LIST_LAYOUT_DEFAULT,
-                               !is_list_all && !is_only_in_path, NULL);
+       ret = btrfs_list_subvols_print(fd, filter_set, comparer_set,
+                       layout, !is_list_all && !is_only_in_path, NULL);
 
 out:
        close_file_or_dir(fd, dirstream);
        if (filter_set)
-               btrfs_list_free_filter_set(filter_set);
+               free(filter_set);
        if (comparer_set)
-               btrfs_list_free_comparer_set(comparer_set);
+               free(comparer_set);
        if (uerr)
                usage(cmd_subvol_list_usage);
        return !!ret;
@@ -635,11 +630,11 @@ static int cmd_subvol_snapshot(int argc, char **argv)
        char    *dupdir = NULL;
        char    *newname;
        char    *dstdir;
+       enum btrfs_util_error err;
        struct btrfs_ioctl_vol_args_v2  args;
        struct btrfs_qgroup_inherit *inherit = NULL;
        DIR *dirstream1 = NULL, *dirstream2 = NULL;
 
-       optind = 1;
        memset(&args, 0, sizeof(args));
        while (1) {
                int c = getopt(argc, argv, "c:i:r");
@@ -683,19 +678,19 @@ static int cmd_subvol_snapshot(int argc, char **argv)
        dst = argv[optind + 1];
 
        retval = 1;     /* failure */
-       res = test_issubvolume(subvol);
-       if (res < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               goto out;
-       }
-       if (!res) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
+       err = btrfs_util_is_subvolume(subvol);
+       if (err) {
+               error_btrfs_util(err);
                goto out;
        }
 
        res = test_isdir(dst);
+       if (res < 0 && res != -ENOENT) {
+               error("cannot access %s: %s", dst, strerror(-res));
+               goto out;
+       }
        if (res == 0) {
-               fprintf(stderr, "ERROR: '%s' exists and it is not a directory\n", dst);
+               error("'%s' exists and it is not a directory", dst);
                goto out;
        }
 
@@ -711,29 +706,23 @@ static int cmd_subvol_snapshot(int argc, char **argv)
        }
 
        if (!test_issubvolname(newname)) {
-               fprintf(stderr, "ERROR: incorrect snapshot name '%s'\n",
-                       newname);
+               error("invalid snapshot name '%s'", newname);
                goto out;
        }
 
        len = strlen(newname);
        if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
-               fprintf(stderr, "ERROR: snapshot name too long '%s'\n",
-                       newname);
+               error("snapshot name too long '%s'", newname);
                goto out;
        }
 
-       fddst = open_file_or_dir(dstdir, &dirstream1);
-       if (fddst < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+       fddst = btrfs_open_dir(dstdir, &dirstream1, 1);
+       if (fddst < 0)
                goto out;
-       }
 
-       fd = open_file_or_dir(subvol, &dirstream2);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+       fd = btrfs_open_dir(subvol, &dirstream2, 1);
+       if (fd < 0)
                goto out;
-       }
 
        if (readonly) {
                args.flags |= BTRFS_SUBVOL_RDONLY;
@@ -755,8 +744,7 @@ static int cmd_subvol_snapshot(int argc, char **argv)
        res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
 
        if (res < 0) {
-               fprintf( stderr, "ERROR: cannot snapshot '%s' - %s\n",
-                       subvol, strerror(errno));
+               error("cannot snapshot '%s': %m", subvol);
                goto out;
        }
 
@@ -781,32 +769,25 @@ static const char * const cmd_subvol_get_default_usage[] = {
 static int cmd_subvol_get_default(int argc, char **argv)
 {
        int fd = -1;
-       int ret;
-       char *subvol;
-       struct btrfs_list_filter_set *filter_set;
-       u64 default_id;
+       int ret = 1;
+       uint64_t default_id;
        DIR *dirstream = NULL;
+       enum btrfs_util_error err;
+       struct btrfs_util_subvolume_info subvol;
+       char *path;
+
+       clean_args_no_options(argc, argv, cmd_subvol_get_default_usage);
 
-       if (check_argc_exact(argc, 2))
+       if (check_argc_exact(argc - optind, 1))
                usage(cmd_subvol_get_default_usage);
 
-       subvol = argv[1];
-       fd = open_file_or_dir(subvol, &dirstream);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
+       fd = btrfs_open_dir(argv[1], &dirstream, 1);
+       if (fd < 0)
                return 1;
-       }
 
-       ret = btrfs_list_get_default_subvolume(fd, &default_id);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't perform the search - %s\n",
-                       strerror(errno));
-               goto out;
-       }
-
-       ret = 1;
-       if (default_id == 0) {
-               fprintf(stderr, "ERROR: 'default' dir item not found\n");
+       err = btrfs_util_get_default_subvolume_fd(fd, &default_id);
+       if (err) {
+               error_btrfs_util(err);
                goto out;
        }
 
@@ -817,60 +798,63 @@ static int cmd_subvol_get_default(int argc, char **argv)
                goto out;
        }
 
-       filter_set = btrfs_list_alloc_filter_set();
-       btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_ROOTID,
-                               default_id);
+       err = btrfs_util_subvolume_info_fd(fd, default_id, &subvol);
+       if (err) {
+               error_btrfs_util(err);
+               goto out;
+       }
 
-       /* by default we shall print the following columns*/
-       btrfs_list_setup_print_column(BTRFS_LIST_OBJECTID);
-       btrfs_list_setup_print_column(BTRFS_LIST_GENERATION);
-       btrfs_list_setup_print_column(BTRFS_LIST_TOP_LEVEL);
-       btrfs_list_setup_print_column(BTRFS_LIST_PATH);
+       err = btrfs_util_subvolume_path_fd(fd, default_id, &path);
+       if (err) {
+               error_btrfs_util(err);
+               goto out;
+       }
 
-       ret = btrfs_list_subvols_print(fd, filter_set, NULL,
-               BTRFS_LIST_LAYOUT_DEFAULT, 1, NULL);
+       printf("ID %" PRIu64 " gen %" PRIu64 " top level %" PRIu64 " path %s\n",
+              subvol.id, subvol.generation, subvol.parent_id, path);
 
-       if (filter_set)
-               btrfs_list_free_filter_set(filter_set);
+       free(path);
+
+       ret = 0;
 out:
        close_file_or_dir(fd, dirstream);
-       return !!ret;
+       return ret;
 }
 
 static const char * const cmd_subvol_set_default_usage[] = {
+       "btrfs subvolume set-default <subvolume>\n"
        "btrfs subvolume set-default <subvolid> <path>",
-       "Set the default subvolume of a filesystem",
+       "Set the default subvolume of the filesystem mounted as default.",
+       "The subvolume can be specified by its path,",
+       "or the pair of subvolume id and path to the filesystem.",
        NULL
 };
 
 static int cmd_subvol_set_default(int argc, char **argv)
 {
-       int     ret=0, fd, e;
-       u64     objectid;
-       char    *path;
-       char    *subvolid;
-       DIR     *dirstream = NULL;
+       u64 objectid;
+       char *path;
+       enum btrfs_util_error err;
 
-       if (check_argc_exact(argc, 3))
-               usage(cmd_subvol_set_default_usage);
-
-       subvolid = argv[1];
-       path = argv[2];
+       clean_args_no_options(argc, argv, cmd_subvol_set_default_usage);
 
-       objectid = arg_strtou64(subvolid);
+       if (check_argc_min(argc - optind, 1) ||
+                       check_argc_max(argc - optind, 2))
+               usage(cmd_subvol_set_default_usage);
 
-       fd = open_file_or_dir(path, &dirstream);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", path);
-               return 1;
+       if (argc - optind == 1) {
+               /* path to the subvolume is specified */
+               objectid = 0;
+               path = argv[optind];
+       } else {
+               /* subvol id and path to the filesystem are specified */
+               objectid = arg_strtou64(argv[optind]);
+               path = argv[optind + 1];
        }
 
-       ret = ioctl(fd, BTRFS_IOC_DEFAULT_SUBVOL, &objectid);
-       e = errno;
-       close_file_or_dir(fd, dirstream);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: unable to set a new default subvolume - %s\n",
-                       strerror(e));
+       err = btrfs_util_set_default_subvolume(path, objectid);
+       if (err) {
+               error_btrfs_util(err);
                return 1;
        }
        return 0;
@@ -889,33 +873,29 @@ static int cmd_subvol_find_new(int argc, char **argv)
        char *subvol;
        u64 last_gen;
        DIR *dirstream = NULL;
+       enum btrfs_util_error err;
 
-       if (check_argc_exact(argc, 3))
+       clean_args_no_options(argc, argv, cmd_subvol_find_new_usage);
+
+       if (check_argc_exact(argc - optind, 2))
                usage(cmd_subvol_find_new_usage);
 
-       subvol = argv[1];
-       last_gen = arg_strtou64(argv[2]);
+       subvol = argv[optind];
+       last_gen = arg_strtou64(argv[optind + 1]);
 
-       ret = test_issubvolume(subvol);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               return 1;
-       }
-       if (!ret) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
+       err = btrfs_util_is_subvolume(subvol);
+       if (err) {
+               error_btrfs_util(err);
                return 1;
        }
 
-       fd = open_file_or_dir(subvol, &dirstream);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
+       fd = btrfs_open_dir(subvol, &dirstream, 1);
+       if (fd < 0)
                return 1;
-       }
 
-       ret = ioctl(fd, BTRFS_IOC_SYNC);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: unable to fs-syncing '%s' - %s\n",
-                       subvol, strerror(errno));
+       err = btrfs_util_sync_fd(fd);
+       if (err) {
+               error_btrfs_util(err);
                close_file_or_dir(fd, dirstream);
                return 1;
        }
@@ -926,155 +906,205 @@ static int cmd_subvol_find_new(int argc, char **argv)
 }
 
 static const char * const cmd_subvol_show_usage[] = {
-       "btrfs subvolume show <subvol-path>",
-       "Show more information of the subvolume",
+       "btrfs subvolume show [options] <subvol-path>|<mnt>",
+       "Show more information about the subvolume",
+       "-r|--rootid   rootid of the subvolume",
+       "-u|--uuid     uuid of the subvolume",
+       "",
+       "If no option is specified, <subvol-path> will be shown, otherwise",
+       "the rootid or uuid are resolved relative to the <mnt> path.",
        NULL
 };
 
 static int cmd_subvol_show(int argc, char **argv)
 {
-       struct root_info get_ri;
-       struct btrfs_list_filter_set *filter_set;
        char tstr[256];
        char uuidparse[BTRFS_UUID_UNPARSED_SIZE];
-       char *fullpath = NULL, *svpath = NULL, *mnt = NULL;
-       char raw_prefix[] = "\t\t\t\t";
-       u64 sv_id;
-       int fd = -1, mntfd = -1;
+       char *fullpath = NULL;
+       int fd = -1;
        int ret = 1;
-       DIR *dirstream1 = NULL, *dirstream2 = NULL;
+       DIR *dirstream1 = NULL;
+       int by_rootid = 0;
+       int by_uuid = 0;
+       u64 rootid_arg = 0;
+       u8 uuid_arg[BTRFS_UUID_SIZE];
+       struct btrfs_util_subvolume_iterator *iter;
+       struct btrfs_util_subvolume_info subvol;
+       char *subvol_path = NULL;
+       enum btrfs_util_error err;
 
-       if (check_argc_exact(argc, 2))
-               usage(cmd_subvol_show_usage);
+       while (1) {
+               int c;
+               static const struct option long_options[] = {
+                       { "rootid", required_argument, NULL, 'r'},
+                       { "uuid", required_argument, NULL, 'u'},
+                       { NULL, 0, NULL, 0 }
+               };
 
-       fullpath = realpath(argv[1], NULL);
-       if (!fullpath) {
-               fprintf(stderr, "ERROR: finding real path for '%s', %s\n",
-                       argv[1], strerror(errno));
-               goto out;
-       }
+               c = getopt_long(argc, argv, "r:u:", long_options, NULL);
+               if (c < 0)
+                       break;
 
-       ret = test_issubvolume(fullpath);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", fullpath);
-               goto out;
-       }
-       if (!ret) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", fullpath);
-               ret = 1;
-               goto out;
+               switch (c) {
+               case 'r':
+                       rootid_arg = arg_strtou64(optarg);
+                       by_rootid = 1;
+                       break;
+               case 'u':
+                       uuid_parse(optarg, uuid_arg);
+                       by_uuid = 1;
+                       break;
+               default:
+                       usage(cmd_subvol_show_usage);
+               }
        }
 
-       ret = find_mount_root(fullpath, &mnt);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: find_mount_root failed on '%s': "
-                               "%s\n", fullpath, strerror(-ret));
-               goto out;
+       if (check_argc_exact(argc - optind, 1))
+               usage(cmd_subvol_show_usage);
+
+       if (by_rootid && by_uuid) {
+               error(
+               "options --rootid and --uuid cannot be used at the same time");
+               usage(cmd_subvol_show_usage);
        }
-       if (ret > 0) {
-               fprintf(stderr,
-                       "ERROR: %s doesn't belong to btrfs mount point\n",
-                       fullpath);
+
+       fullpath = realpath(argv[optind], NULL);
+       if (!fullpath) {
+               error("cannot find real path for '%s': %m", argv[optind]);
                goto out;
        }
-       ret = 1;
-       svpath = get_subvol_name(mnt, fullpath);
 
        fd = open_file_or_dir(fullpath, &dirstream1);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", fullpath);
+               error("can't access '%s'", fullpath);
                goto out;
        }
 
-       ret = btrfs_list_get_path_rootid(fd, &sv_id);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't get rootid for '%s'\n",
-                       fullpath);
-               goto out;
-       }
+       if (by_uuid) {
+               err = btrfs_util_create_subvolume_iterator_fd(fd,
+                                                             BTRFS_FS_TREE_OBJECTID,
+                                                             0, &iter);
+               if (err) {
+                       error_btrfs_util(err);
+                       goto out;
+               }
 
-       mntfd = open_file_or_dir(mnt, &dirstream2);
-       if (mntfd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", mnt);
-               goto out;
-       }
+               for (;;) {
+                       err = btrfs_util_subvolume_iterator_next_info(iter,
+                                                                     &subvol_path,
+                                                                     &subvol);
+                       if (err == BTRFS_UTIL_ERROR_STOP_ITERATION) {
+                               uuid_unparse(uuid_arg, uuidparse);
+                               error("can't find uuid '%s' on '%s'", uuidparse,
+                                     fullpath);
+                               btrfs_util_destroy_subvolume_iterator(iter);
+                               goto out;
+                       } else if (err) {
+                               error_btrfs_util(err);
+                               btrfs_util_destroy_subvolume_iterator(iter);
+                               goto out;
+                       }
 
-       if (sv_id == BTRFS_FS_TREE_OBJECTID) {
-               printf("%s is btrfs root\n", fullpath);
-               goto out;
-       }
+                       if (uuid_compare(subvol.uuid, uuid_arg) == 0)
+                               break;
 
-       memset(&get_ri, 0, sizeof(get_ri));
-       get_ri.root_id = sv_id;
+                       free(subvol_path);
+               }
+               btrfs_util_destroy_subvolume_iterator(iter);
+       } else {
+               /*
+                * If !by_rootid, rootid_arg = 0, which means find the
+                * subvolume ID of the fd and use that.
+                */
+               err = btrfs_util_subvolume_info_fd(fd, rootid_arg, &subvol);
+               if (err) {
+                       error_btrfs_util(err);
+                       goto out;
+               }
+
+               err = btrfs_util_subvolume_path_fd(fd, subvol.id, &subvol_path);
+               if (err) {
+                       error_btrfs_util(err);
+                       goto out;
+               }
 
-       ret = btrfs_get_subvol(mntfd, &get_ri);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't find '%s'\n",
-                       svpath);
-               goto out;
        }
 
        /* print the info */
-       printf("%s\n", fullpath);
-       printf("\tName: \t\t\t%s\n", get_ri.name);
+       printf("%s\n", subvol.id == BTRFS_FS_TREE_OBJECTID ? "/" : subvol_path);
+       printf("\tName: \t\t\t%s\n",
+              (subvol.id == BTRFS_FS_TREE_OBJECTID ? "<FS_TREE>" :
+               basename(subvol_path)));
 
-       if (uuid_is_null(get_ri.uuid))
+       if (uuid_is_null(subvol.uuid))
                strcpy(uuidparse, "-");
        else
-               uuid_unparse(get_ri.uuid, uuidparse);
+               uuid_unparse(subvol.uuid, uuidparse);
        printf("\tUUID: \t\t\t%s\n", uuidparse);
 
-       if (uuid_is_null(get_ri.puuid))
+       if (uuid_is_null(subvol.parent_uuid))
                strcpy(uuidparse, "-");
        else
-               uuid_unparse(get_ri.puuid, uuidparse);
+               uuid_unparse(subvol.parent_uuid, uuidparse);
        printf("\tParent UUID: \t\t%s\n", uuidparse);
 
-       if (uuid_is_null(get_ri.ruuid))
+       if (uuid_is_null(subvol.received_uuid))
                strcpy(uuidparse, "-");
        else
-               uuid_unparse(get_ri.ruuid, uuidparse);
+               uuid_unparse(subvol.received_uuid, uuidparse);
        printf("\tReceived UUID: \t\t%s\n", uuidparse);
 
-       if (get_ri.otime) {
+       if (subvol.otime.tv_sec) {
                struct tm tm;
 
-               localtime_r(&get_ri.otime, &tm);
+               localtime_r(&subvol.otime.tv_sec, &tm);
                strftime(tstr, 256, "%Y-%m-%d %X %z", &tm);
        } else
                strcpy(tstr, "-");
        printf("\tCreation time: \t\t%s\n", tstr);
 
-       printf("\tSubvolume ID: \t\t%llu\n", get_ri.root_id);
-       printf("\tGeneration: \t\t%llu\n", get_ri.gen);
-       printf("\tGen at creation: \t%llu\n", get_ri.ogen);
-       printf("\tParent ID: \t\t%llu\n", get_ri.ref_tree);
-       printf("\tTop level ID: \t\t%llu\n", get_ri.top_id);
+       printf("\tSubvolume ID: \t\t%" PRIu64 "\n", subvol.id);
+       printf("\tGeneration: \t\t%" PRIu64 "\n", subvol.generation);
+       printf("\tGen at creation: \t%" PRIu64 "\n", subvol.otransid);
+       printf("\tParent ID: \t\t%" PRIu64 "\n", subvol.parent_id);
+       printf("\tTop level ID: \t\t%" PRIu64 "\n", subvol.parent_id);
 
-       if (get_ri.flags & BTRFS_ROOT_SUBVOL_RDONLY)
+       if (subvol.flags & BTRFS_ROOT_SUBVOL_RDONLY)
                printf("\tFlags: \t\t\treadonly\n");
        else
                printf("\tFlags: \t\t\t-\n");
 
        /* print the snapshots of the given subvol if any*/
        printf("\tSnapshot(s):\n");
-       filter_set = btrfs_list_alloc_filter_set();
-       btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_BY_PARENT,
-                               (u64)(unsigned long)get_ri.uuid);
-       btrfs_list_setup_print_column(BTRFS_LIST_PATH);
-       btrfs_list_subvols_print(fd, filter_set, NULL, BTRFS_LIST_LAYOUT_RAW,
-                       1, raw_prefix);
 
-       /* clean up */
-       free(get_ri.path);
-       free(get_ri.name);
-       free(get_ri.full_path);
-       btrfs_list_free_filter_set(filter_set);
+       err = btrfs_util_create_subvolume_iterator_fd(fd,
+                                                     BTRFS_FS_TREE_OBJECTID, 0,
+                                                     &iter);
+
+       for (;;) {
+               struct btrfs_util_subvolume_info subvol2;
+               char *path;
 
+               err = btrfs_util_subvolume_iterator_next_info(iter, &path, &subvol2);
+               if (err == BTRFS_UTIL_ERROR_STOP_ITERATION) {
+                       break;
+               } else if (err) {
+                       error_btrfs_util(err);
+                       btrfs_util_destroy_subvolume_iterator(iter);
+                       goto out;
+               }
+
+               if (uuid_compare(subvol2.parent_uuid, subvol.uuid) == 0)
+                       printf("\t\t\t\t%s\n", path);
+
+               free(path);
+       }
+       btrfs_util_destroy_subvolume_iterator(iter);
+
+       ret = 0;
 out:
+       free(subvol_path);
        close_file_or_dir(fd, dirstream1);
-       close_file_or_dir(mntfd, dirstream2);
-       free(mnt);
        free(fullpath);
        return !!ret;
 }
@@ -1092,160 +1122,16 @@ static const char * const cmd_subvol_sync_usage[] = {
        NULL
 };
 
-#if 0
-/*
- * If we're looking for any dead subvolume, take a shortcut and look
- * for any ORPHAN_ITEMs in the tree root
- */
-static int fs_has_dead_subvolumes(int fd)
-{
-       int ret;
-       struct btrfs_ioctl_search_args args;
-       struct btrfs_ioctl_search_key *sk = &args.key;
-       struct btrfs_ioctl_search_header sh;
-       u64 min_subvolid = 0;
-
-again:
-       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
-       sk->min_objectid = BTRFS_ORPHAN_OBJECTID;
-       sk->max_objectid = BTRFS_ORPHAN_OBJECTID;
-       sk->min_type = BTRFS_ORPHAN_ITEM_KEY;
-       sk->max_type = BTRFS_ORPHAN_ITEM_KEY;
-       sk->min_offset = min_subvolid;
-       sk->max_offset = (u64)-1;
-       sk->min_transid = 0;
-       sk->max_transid = (u64)-1;
-       sk->nr_items = 1;
-
-       ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-       if (ret < 0)
-               return -errno;
-
-       if (!sk->nr_items)
-               return 0;
-
-       memcpy(&sh, args.buf, sizeof(sh));
-       min_subvolid = sh.offset;
-
-       /*
-        * Verify that the root item is really there and we haven't hit
-        * a stale orphan
-        */
-       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
-       sk->min_objectid = min_subvolid;
-       sk->max_objectid = min_subvolid;
-       sk->min_type = BTRFS_ROOT_ITEM_KEY;
-       sk->max_type = BTRFS_ROOT_ITEM_KEY;
-       sk->min_offset = 0;
-       sk->max_offset = (u64)-1;
-       sk->min_transid = 0;
-       sk->max_transid = (u64)-1;
-       sk->nr_items = 1;
-
-       ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-       if (ret < 0)
-               return -errno;
-
-       /*
-        * Stale orphan, try the next one
-        */
-       if (!sk->nr_items) {
-               min_subvolid++;
-               goto again;
-       }
-
-       return 1;
-}
-#endif
-
-#define SUBVOL_ID_BATCH                1024
-
-/*
- * Enumerate all dead subvolumes that exist in the filesystem.
- * Fill @ids and reallocate to bigger size if needed.
- */
-static int enumerate_dead_subvols(int fd, u64 **ids)
-{
-       int ret;
-       struct btrfs_ioctl_search_args args;
-       struct btrfs_ioctl_search_key *sk = &args.key;
-       int idx = 0;
-       int count = 0;
-
-       memset(&args, 0, sizeof(args));
-
-       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
-       sk->min_objectid = BTRFS_ORPHAN_OBJECTID;
-       sk->max_objectid = BTRFS_ORPHAN_OBJECTID;
-       sk->min_type = BTRFS_ORPHAN_ITEM_KEY;
-       sk->max_type = BTRFS_ORPHAN_ITEM_KEY;
-       sk->min_offset = 0;
-       sk->max_offset = (u64)-1;
-       sk->min_transid = 0;
-       sk->max_transid = (u64)-1;
-       sk->nr_items = 4096;
-
-       *ids = NULL;
-       while (1) {
-               struct btrfs_ioctl_search_header *sh;
-               unsigned long off;
-               int i;
-
-               ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-               if (ret < 0)
-                       return -errno;
-
-               if (!sk->nr_items)
-                       return idx;
-
-               off = 0;
-               for (i = 0; i < sk->nr_items; i++) {
-                       sh = (struct btrfs_ioctl_search_header*)(args.buf + off);
-                       off += sizeof(*sh);
-
-                       if (sh->type == BTRFS_ORPHAN_ITEM_KEY) {
-                               if (idx >= count) {
-                                       u64 *newids;
-
-                                       count += SUBVOL_ID_BATCH;
-                                       newids = (u64*)realloc(*ids, count);
-                                       if (!newids)
-                                               return -ENOMEM;
-                                       *ids = newids;
-                               }
-                               (*ids)[idx] = sh->offset;
-                               idx++;
-                       }
-                       off += sh->len;
-
-                       sk->min_objectid = sh->objectid;
-                       sk->min_type = sh->type;
-                       sk->min_offset = sh->offset;
-               }
-               if (sk->min_offset < (u64)-1)
-                       sk->min_offset++;
-               else
-                       break;
-               if (sk->min_type != BTRFS_ORPHAN_ITEM_KEY)
-                       break;
-               if (sk->min_objectid != BTRFS_ORPHAN_OBJECTID)
-                       break;
-       }
-
-       return idx;
-}
-
 static int cmd_subvol_sync(int argc, char **argv)
 {
        int fd = -1;
-       int i;
        int ret = 1;
        DIR *dirstream = NULL;
-       u64 *ids = NULL;
-       int id_count;
+       uint64_t *ids = NULL;
+       size_t id_count, i;
        int sleep_interval = 1;
+       enum btrfs_util_error err;
 
-       optind = 1;
        while (1) {
                int c = getopt(argc, argv, "s:");
 
@@ -1254,11 +1140,9 @@ static int cmd_subvol_sync(int argc, char **argv)
 
                switch (c) {
                case 's':
-                       sleep_interval = atoi(argv[optind]);
+                       sleep_interval = atoi(optarg);
                        if (sleep_interval < 1) {
-                               fprintf(stderr,
-                                       "ERROR: invalid sleep interval %s\n",
-                                       argv[optind]);
+                               error("invalid sleep interval %s", optarg);
                                ret = 1;
                                goto out;
                        }
@@ -1271,9 +1155,8 @@ static int cmd_subvol_sync(int argc, char **argv)
        if (check_argc_min(argc - optind, 1))
                usage(cmd_subvol_sync_usage);
 
-       fd = open_file_or_dir(argv[optind], &dirstream);
+       fd = btrfs_open_dir(argv[optind], &dirstream, 1);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind]);
                ret = 1;
                goto out;
        }
@@ -1281,10 +1164,9 @@ static int cmd_subvol_sync(int argc, char **argv)
 
        id_count = argc - optind;
        if (!id_count) {
-               id_count = enumerate_dead_subvols(fd, &ids);
-               if (id_count < 0) {
-                       fprintf(stderr, "ERROR: can't enumerate dead subvolumes: %s\n",
-                                       strerror(-id_count));
+               err = btrfs_util_deleted_subvolumes_fd(fd, &ids, &id_count);
+               if (err) {
+                       error_btrfs_util(err);
                        ret = 1;
                        goto out;
                }
@@ -1293,9 +1175,9 @@ static int cmd_subvol_sync(int argc, char **argv)
                        goto out;
                }
        } else {
-               ids = (u64*)malloc(id_count * sizeof(u64));
+               ids = malloc(id_count * sizeof(uint64_t));
                if (!ids) {
-                       fprintf(stderr, "ERROR: not enough memory\n");
+                       error("not enough memory");
                        ret = 1;
                        goto out;
                }
@@ -1307,18 +1189,14 @@ static int cmd_subvol_sync(int argc, char **argv)
                        arg = argv[optind + i];
                        errno = 0;
                        id = strtoull(arg, NULL, 10);
-                       if (errno < 0) {
-                               fprintf(stderr,
-                                       "ERROR: unrecognized subvolume id %s\n",
-                                       arg);
+                       if (errno) {
+                               error("unrecognized subvolume id %s", arg);
                                ret = 1;
                                goto out;
                        }
-                       if (id < BTRFS_FIRST_FREE_OBJECTID
-                                       || id > BTRFS_LAST_FREE_OBJECTID) {
-                               fprintf(stderr,
-                                       "ERROR: subvolume id %s out of range\n",
-                                       arg);
+                       if (id < BTRFS_FIRST_FREE_OBJECTID ||
+                           id > BTRFS_LAST_FREE_OBJECTID) {
+                               error("subvolume id %s out of range", arg);
                                ret = 1;
                                goto out;
                        }