btrfs-progs: image: introduce symbolic names for the sanitization modes

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

diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index 3895d11..dc626a6 100644 (file)
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -21,10 +21,12 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/stat.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 <libgen.h>
 #include <limits.h>
 #include <getopt.h>
 #include <uuid/uuid.h>

+#include <linux/magic.h>

 
 #include "kerncompat.h"
 #include "ioctl.h"
 
 #include "kerncompat.h"
 #include "ioctl.h"


@@ -35,6 +37,68 @@
 #include "utils.h"
 #include "btrfs-list.h"
 #include "utils.h"
 #include "utils.h"
 #include "btrfs-list.h"
 #include "utils.h"

+#include "help.h"
+
+static int is_subvolume_cleaned(int fd, u64 subvolid)
+{
+       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;
+
+       while (1) {
+               int clean = 1;
+
+               for (i = 0; i < count; i++) {
+                       if (!ids[i])
+                               continue;
+                       ret = is_subvolume_cleaned(fd, ids[i]);
+                       if (ret < 0) {
+                               error(
+                           "cannot read status of dead subvolume %llu: %s",
+                                       (unsigned long long)ids[i], strerror(-ret));
+                               return ret;
+                       }
+                       if (ret) {
+                               printf("Subvolume id %llu is gone\n", ids[i]);
+                               ids[i] = 0;
+                       } else {
+                               clean = 0;
+                       }
+               }
+               if (clean)
+                       break;
+               sleep(sleep_interval);
+       }
+
+       return 0;
+}

 
 static const char * const subvolume_cmd_group_usage[] = {
        "btrfs subvolume <command> <args>",
 
 static const char * const subvolume_cmd_group_usage[] = {
        "btrfs subvolume <command> <args>",


@@ -64,9 +128,8 @@ static int cmd_subvol_create(int argc, char **argv)
        struct btrfs_qgroup_inherit *inherit = NULL;
        DIR     *dirstream = NULL;
 
        struct btrfs_qgroup_inherit *inherit = NULL;
        DIR     *dirstream = NULL;
 

-       optind = 1;

        while (1) {
        while (1) {

-               int c = getopt(argc, argv, "c:i:v");
+               int c = getopt(argc, argv, "c:i:");

                if (c < 0)
                        break;
 
                if (c < 0)
                        break;
 


@@ -97,8 +160,12 @@ static int cmd_subvol_create(int argc, char **argv)
 
        retval = 1;     /* failure */
        res = test_isdir(dst);
 
        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) {
        if (res >= 0) {

-               fprintf(stderr, "ERROR: '%s' exists\n", dst);
+               error("target path already exists: %s", dst);

                goto out;
        }
 
                goto out;
        }
 


@@ -108,23 +175,19 @@ static int cmd_subvol_create(int argc, char **argv)
        dstdir = dirname(dupdir);
 
        if (!test_issubvolname(newname)) {
        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) {
                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;
        }
 
                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;
                goto out;

-       }

 
        printf("Create subvolume '%s/%s'\n", dstdir, newname);
        if (inherit) {
 
        printf("Create subvolume '%s/%s'\n", dstdir, newname);
        if (inherit) {


@@ -147,8 +210,7 @@ static int cmd_subvol_create(int argc, char **argv)
        }
 
        if (res < 0) {
        }
 
        if (res < 0) {

-               fprintf(stderr, "ERROR: cannot create subvolume - %s\n",
-                       strerror(errno));
+               error("cannot create subvolume: %s", strerror(errno));

                goto out;
        }
 
                goto out;
        }
 


@@ -162,25 +224,6 @@ out:
        return retval;
 }
 
        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)
-{
-       struct stat     st;
-       int             res;
-
-       res = stat(path, &st);
-       if(res < 0 )
-               return -1;
-
-       return (st.st_ino == 256) && S_ISDIR(st.st_mode);
-}
-

 static int wait_for_commit(int fd)
 {
        int ret;
 static int wait_for_commit(int fd)
 {
        int ret;


@@ -203,12 +246,13 @@ 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",
        "",
        "-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)
 {
        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;
        int cnt;
        int fd = -1;
        struct btrfs_ioctl_vol_args     args;


@@ -219,26 +263,30 @@ static int cmd_subvol_delete(int argc, char **argv)
        DIR     *dirstream = NULL;
        int verbose = 0;
        int commit_mode = 0;
        DIR     *dirstream = NULL;
        int verbose = 0;
        int commit_mode = 0;

-       struct option long_options[] = {
-               {"commit-after", no_argument, NULL, 'c'},  /* commit mode 1 */
-               {"commit-each", no_argument, NULL, 'C'},  /* commit mode 2 */
-               {NULL, 0, NULL, 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 };

 
 

-       optind = 1;

        while (1) {
                int c;
        while (1) {
                int c;

-
-               c = getopt_long(argc, argv, "cC", long_options, NULL);
+               static const struct option long_options[] = {
+                       {"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, "cCv", long_options, NULL);

                if (c < 0)
                        break;
 
                switch(c) {
                case 'c':
                if (c < 0)
                        break;
 
                switch(c) {
                case 'c':

-                       commit_mode = 1;
+                       commit_mode = COMMIT_AFTER;

                        break;
                case 'C':
                        break;
                case 'C':

-                       commit_mode = 2;
+                       commit_mode = COMMIT_EACH;

                        break;
                case 'v':
                        verbose++;
                        break;
                case 'v':
                        verbose++;


@@ -254,7 +302,7 @@ static int cmd_subvol_delete(int argc, char **argv)
        if (verbose > 0) {
                printf("Transaction commit: %s\n",
                        !commit_mode ? "none (default)" :
        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;
        }
 
        cnt = optind;


@@ -264,12 +312,12 @@ again:
 
        res = test_issubvolume(path);
        if (res < 0) {
 
        res = test_issubvolume(path);
        if (res < 0) {

-               fprintf(stderr, "ERROR: error accessing '%s'\n", path);
+               error("cannot access subvolume %s: %s", path, strerror(-res));

                ret = 1;
                goto out;
        }
        if (!res) {
                ret = 1;
                goto out;
        }
        if (!res) {

-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", path);
+               error("not a subvolume: %s", path);

                ret = 1;
                goto out;
        }
                ret = 1;
                goto out;
        }


@@ -277,7 +325,7 @@ again:
        cpath = realpath(path, NULL);
        if (!cpath) {
                ret = errno;
        cpath = realpath(path, NULL);
        if (!cpath) {
                ret = errno;

-               fprintf(stderr, "ERROR: finding real path for '%s': %s\n",
+               error("cannot find real path for '%s': %s",

                        path, strerror(errno));
                goto out;
        }
                        path, strerror(errno));
                goto out;
        }


@@ -287,61 +335,100 @@ again:
        vname = basename(dupvname);
        free(cpath);
 
        vname = basename(dupvname);
        free(cpath);
 

-       fd = open_file_or_dir(dname, &dirstream);
+       fd = btrfs_open_dir(dname, &dirstream, 1);

        if (fd < 0) {
        if (fd < 0) {

-               fprintf(stderr, "ERROR: can't access '%s'\n", dname);

                ret = 1;
                goto out;
        }
 
        printf("Delete subvolume (%s): '%s/%s'\n",
                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);
                ? "commit" : "no-commit", dname, vname);

+       memset(&args, 0, sizeof(args));

        strncpy_null(args.name, vname);
        res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
        strncpy_null(args.name, vname);
        res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);

-       e = errno;
-

        if(res < 0 ){
        if(res < 0 ){

-               fprintf( stderr, "ERROR: cannot delete '%s/%s' - %s\n",
-                       dname, vname, strerror(e));
+               error("cannot delete '%s/%s': %s", dname, vname,
+                       strerror(errno));

                ret = 1;
                goto out;
        }
 
                ret = 1;
                goto out;
        }
 

-       if (commit_mode == 1) {
+       if (commit_mode == COMMIT_EACH) {

                res = wait_for_commit(fd);
                if (res < 0) {
                res = wait_for_commit(fd);
                if (res < 0) {

-                       fprintf(stderr,
-                               "ERROR: unable to wait for commit after '%s': %s\n",
+                       error("unable to wait for commit after '%s': %s",

                                path, strerror(errno));
                        ret = 1;
                }
                                path, strerror(errno));
                        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 suceeded 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:
        }
 
 out:

+       close_file_or_dir(fd, dirstream);
+keep_fd:
+       fd = -1;
+       dirstream = NULL;

        free(dupdname);
        free(dupvname);
        dupdname = NULL;
        dupvname = NULL;
        cnt++;
        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;
                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: %s, fsid: %s",
+                                               strerror(errno), 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;
 }
 
        return ret;
 }


@@ -352,24 +439,32 @@ out:
  * - lowercase for enabling specific items in the output
  */
 static const char * const cmd_subvol_list_usage[] = {
  * - 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>",
        "-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",
        "-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",
        "-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",
        "-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)",
        "-G [+|-]value",
        "             filter the subvolumes by generation",
        "             (+value: >= value; -value: <= value; value: = value)",


@@ -391,22 +486,22 @@ static int cmd_subvol_list(int argc, char **argv)
        int fd = -1;
        u64 top_id;
        int ret = -1, uerr = 0;
        int fd = -1;
        u64 top_id;
        int ret = -1, uerr = 0;

-       int c;

        char *subvol;
        char *subvol;

-       int is_tab_result = 0;

        int is_list_all = 0;
        int is_only_in_path = 0;
        int is_list_all = 0;
        int is_only_in_path = 0;

-       struct option long_options[] = {
-               {"sort", 1, NULL, 'S'},
-               {NULL, 0, NULL, 0}
-       };

        DIR *dirstream = NULL;
        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();
 
 
        filter_set = btrfs_list_alloc_filter_set();
        comparer_set = btrfs_list_alloc_comparer_set();
 

-       optind = 1;

        while(1) {
        while(1) {

+               int c;
+               static const struct option long_options[] = {
+                       {"sort", required_argument, NULL, 'S'},
+                       {NULL, 0, NULL, 0}
+               };
+

                c = getopt_long(argc, argv,
                                    "acdgopqsurRG:C:t", long_options, NULL);
                if (c < 0)
                c = getopt_long(argc, argv,
                                    "acdgopqsurRG:C:t", long_options, NULL);
                if (c < 0)


@@ -434,7 +529,7 @@ static int cmd_subvol_list(int argc, char **argv)
                        is_only_in_path = 1;
                        break;
                case 't':
                        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,
                        break;
                case 's':
                        btrfs_list_setup_filter(&filter_set,


@@ -491,28 +586,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];
        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;
        if (fd < 0) {
                ret = -1;

-               fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
+               error("can't access '%s'", subvol);

                goto out;
        }
 
                goto out;
        }
 

+       if (flags)
+               btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_FLAGS,
+                                       flags);
+

        ret = btrfs_list_get_path_rootid(fd, &top_id);
        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;
                goto out;

-       }

 
        if (is_list_all)
                btrfs_list_setup_filter(&filter_set,
 
        if (is_list_all)
                btrfs_list_setup_filter(&filter_set,


@@ -529,27 +622,21 @@ 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);
 
        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)
 
 out:
        close_file_or_dir(fd, dirstream);
        if (filter_set)

-               btrfs_list_free_filter_set(filter_set);
+               free(filter_set);

        if (comparer_set)
        if (comparer_set)

-               btrfs_list_free_comparer_set(comparer_set);
+               free(comparer_set);

        if (uerr)
                usage(cmd_subvol_list_usage);
        return !!ret;
 }
 
        if (uerr)
                usage(cmd_subvol_list_usage);
        return !!ret;
 }
 

-static const char * const cmd_snapshot_usage[] = {
+static const char * const cmd_subvol_snapshot_usage[] = {

        "btrfs subvolume snapshot [-r] [-i <qgroupid>] <source> <dest>|[<dest>/]<name>",
        "Create a snapshot of the subvolume",
        "Create a writable/readonly snapshot of the subvolume <source> with",
        "btrfs subvolume snapshot [-r] [-i <qgroupid>] <source> <dest>|[<dest>/]<name>",
        "Create a snapshot of the subvolume",
        "Create a writable/readonly snapshot of the subvolume <source> with",


@@ -562,7 +649,7 @@ static const char * const cmd_snapshot_usage[] = {
        NULL
 };
 
        NULL
 };
 

-static int cmd_snapshot(int argc, char **argv)
+static int cmd_subvol_snapshot(int argc, char **argv)

 {
        char    *subvol, *dst;
        int     res, retval;
 {
        char    *subvol, *dst;
        int     res, retval;


@@ -576,7 +663,6 @@ static int cmd_snapshot(int argc, char **argv)
        struct btrfs_qgroup_inherit *inherit = NULL;
        DIR *dirstream1 = NULL, *dirstream2 = NULL;
 
        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");
        memset(&args, 0, sizeof(args));
        while (1) {
                int c = getopt(argc, argv, "c:i:r");


@@ -609,12 +695,12 @@ static int cmd_snapshot(int argc, char **argv)
                        }
                        break;
                default:
                        }
                        break;
                default:

-                       usage(cmd_snapshot_usage);
+                       usage(cmd_subvol_snapshot_usage);

                }
        }
 
        if (check_argc_exact(argc - optind, 2))
                }
        }
 
        if (check_argc_exact(argc - optind, 2))

-               usage(cmd_snapshot_usage);
+               usage(cmd_subvol_snapshot_usage);

 
        subvol = argv[optind];
        dst = argv[optind + 1];
 
        subvol = argv[optind];
        dst = argv[optind + 1];


@@ -622,17 +708,21 @@ static int cmd_snapshot(int argc, char **argv)
        retval = 1;     /* failure */
        res = test_issubvolume(subvol);
        if (res < 0) {
        retval = 1;     /* failure */
        res = test_issubvolume(subvol);
        if (res < 0) {

-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
+               error("cannot access subvolume %s: %s", subvol, strerror(-res));

                goto out;
        }
        if (!res) {
                goto out;
        }
        if (!res) {

-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
+               error("not a subvolume: %s", subvol);

                goto out;
        }
 
        res = test_isdir(dst);
                goto out;
        }
 
        res = test_isdir(dst);

+       if (res < 0 && res != -ENOENT) {
+               error("cannot access %s: %s", dst, strerror(-res));
+               goto out;
+       }

        if (res == 0) {
        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;
        }
 
                goto out;
        }
 


@@ -648,29 +738,23 @@ static int cmd_snapshot(int argc, char **argv)
        }
 
        if (!test_issubvolname(newname)) {
        }
 
        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) {
                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;
        }
 
                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;
                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;
                goto out;

-       }

 
        if (readonly) {
                args.flags |= BTRFS_SUBVOL_RDONLY;
 
        if (readonly) {
                args.flags |= BTRFS_SUBVOL_RDONLY;


@@ -692,8 +776,7 @@ static int cmd_snapshot(int argc, char **argv)
        res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
 
        if (res < 0) {
        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': %s", subvol, strerror(errno));

                goto out;
        }
 
                goto out;
        }
 


@@ -724,26 +807,26 @@ static int cmd_subvol_get_default(int argc, char **argv)
        u64 default_id;
        DIR *dirstream = NULL;
 
        u64 default_id;
        DIR *dirstream = NULL;
 

-       if (check_argc_exact(argc, 2))
+       clean_args_no_options(argc, argv, cmd_subvol_get_default_usage);
+
+       if (check_argc_exact(argc - optind, 1))

                usage(cmd_subvol_get_default_usage);
 
        subvol = argv[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(subvol, &dirstream, 1);
+       if (fd < 0)

                return 1;
                return 1;

-       }

 
        ret = btrfs_list_get_default_subvolume(fd, &default_id);
        if (ret) {
 
        ret = btrfs_list_get_default_subvolume(fd, &default_id);
        if (ret) {

-               fprintf(stderr, "ERROR: can't perform the search - %s\n",
+               error("failed to look up default subvolume: %s",

                        strerror(errno));
                goto out;
        }
 
        ret = 1;
        if (default_id == 0) {
                        strerror(errno));
                goto out;
        }
 
        ret = 1;
        if (default_id == 0) {

-               fprintf(stderr, "ERROR: 'default' dir item not found\n");
+               error("'default' dir item not found");

                goto out;
        }
 
                goto out;
        }
 


@@ -768,15 +851,18 @@ static int cmd_subvol_get_default(int argc, char **argv)
                BTRFS_LIST_LAYOUT_DEFAULT, 1, NULL);
 
        if (filter_set)
                BTRFS_LIST_LAYOUT_DEFAULT, 1, NULL);
 
        if (filter_set)

-               btrfs_list_free_filter_set(filter_set);
+               free(filter_set);

 out:
        close_file_or_dir(fd, dirstream);
        return !!ret;
 }
 
 static const char * const cmd_subvol_set_default_usage[] = {
 out:
        close_file_or_dir(fd, dirstream);
        return !!ret;
 }
 
 static const char * const cmd_subvol_set_default_usage[] = {

+       "btrfs subvolume set-default <subvolume>\n"

        "btrfs subvolume set-default <subvolid> <path>",
        "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
 };
 
        NULL
 };
 


@@ -788,38 +874,64 @@ static int cmd_subvol_set_default(int argc, char **argv)
        char    *subvolid;
        DIR     *dirstream = NULL;
 
        char    *subvolid;
        DIR     *dirstream = NULL;
 

-       if (check_argc_exact(argc, 3))
+       clean_args_no_options(argc, argv, cmd_subvol_set_default_usage);
+
+       if (check_argc_min(argc - optind, 1) ||
+                       check_argc_max(argc - optind, 2))

                usage(cmd_subvol_set_default_usage);
 
                usage(cmd_subvol_set_default_usage);
 

-       subvolid = argv[1];
-       path = argv[2];
+       if (argc - optind == 1) {
+               /* path to the subvolume is specified */
+               path = argv[optind];
+
+               ret = test_issubvolume(path);
+               if (ret < 0) {
+                       error("stat error: %s", strerror(-ret));
+                       return 1;
+               } else if (!ret) {
+                       error("'%s' is not a subvolume", path);
+                       return 1;
+               }

 
 

-       objectid = arg_strtou64(subvolid);
+               fd = btrfs_open_dir(path, &dirstream, 1);
+               if (fd < 0)
+                       return 1;

 
 

-       fd = open_file_or_dir(path, &dirstream);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", path);
-               return 1;
+               ret = lookup_path_rootid(fd, &objectid);
+               if (ret) {
+                       error("unable to get subvol id: %s", strerror(-ret));
+                       close_file_or_dir(fd, dirstream);
+                       return 1;
+               }
+       } else {
+               /* subvol id and path to the filesystem are specified */
+               subvolid = argv[optind];
+               path = argv[optind + 1];
+               objectid = arg_strtou64(subvolid);
+
+               fd = btrfs_open_dir(path, &dirstream, 1);
+               if (fd < 0)
+                       return 1;

        }
 
        ret = ioctl(fd, BTRFS_IOC_DEFAULT_SUBVOL, &objectid);
        e = errno;
        close_file_or_dir(fd, dirstream);
        if (ret < 0) {
        }
 
        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",
+               error("unable to set a new default subvolume: %s",

                        strerror(e));
                return 1;
        }
        return 0;
 }
 
                        strerror(e));
                return 1;
        }
        return 0;
 }
 

-static const char * const cmd_find_new_usage[] = {
+static const char * const cmd_subvol_find_new_usage[] = {

        "btrfs subvolume find-new <path> <lastgen>",
        "List the recently modified files in a filesystem",
        NULL
 };
 
        "btrfs subvolume find-new <path> <lastgen>",
        "List the recently modified files in a filesystem",
        NULL
 };
 

-static int cmd_find_new(int argc, char **argv)
+static int cmd_subvol_find_new(int argc, char **argv)

 {
        int fd;
        int ret;
 {
        int fd;
        int ret;


@@ -827,31 +939,31 @@ static int cmd_find_new(int argc, char **argv)
        u64 last_gen;
        DIR *dirstream = NULL;
 
        u64 last_gen;
        DIR *dirstream = NULL;
 

-       if (check_argc_exact(argc, 3))
-               usage(cmd_find_new_usage);
+       clean_args_no_options(argc, argv, cmd_subvol_find_new_usage);

 
 

-       subvol = argv[1];
-       last_gen = arg_strtou64(argv[2]);
+       if (check_argc_exact(argc - optind, 2))
+               usage(cmd_subvol_find_new_usage);
+
+       subvol = argv[optind];
+       last_gen = arg_strtou64(argv[optind + 1]);

 
        ret = test_issubvolume(subvol);
        if (ret < 0) {
 
        ret = test_issubvolume(subvol);
        if (ret < 0) {

-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
+               error("cannot access subvolume %s: %s", subvol, strerror(-ret));

                return 1;
        }
        if (!ret) {
                return 1;
        }
        if (!ret) {

-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
+               error("not a subvolume: %s", subvol);

                return 1;
        }
 
                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;
                return 1;

-       }

 
        ret = ioctl(fd, BTRFS_IOC_SYNC);
        if (ret < 0) {
 
        ret = ioctl(fd, BTRFS_IOC_SYNC);
        if (ret < 0) {

-               fprintf(stderr, "ERROR: unable to fs-syncing '%s' - %s\n",
+               error("sync ioctl failed on '%s': %s",

                        subvol, strerror(errno));
                close_file_or_dir(fd, dirstream);
                return 1;
                        subvol, strerror(errno));
                close_file_or_dir(fd, dirstream);
                return 1;


@@ -863,130 +975,130 @@ static int cmd_find_new(int argc, char **argv)
 }
 
 static const char * const cmd_subvol_show_usage[] = {
 }
 
 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;
        NULL
 };
 
 static int cmd_subvol_show(int argc, char **argv)
 {
        struct root_info get_ri;

-       struct btrfs_list_filter_set *filter_set;
+       struct btrfs_list_filter_set *filter_set = NULL;

        char tstr[256];
        char uuidparse[BTRFS_UUID_UNPARSED_SIZE];
        char tstr[256];
        char uuidparse[BTRFS_UUID_UNPARSED_SIZE];

-       char *fullpath = NULL, *svpath = NULL, *mnt = NULL;
+       char *fullpath = NULL;

        char raw_prefix[] = "\t\t\t\t";
        char raw_prefix[] = "\t\t\t\t";

-       u64 sv_id, mntid;
-       int fd = -1, mntfd = -1;
+       int fd = -1;

        int ret = 1;
        int ret = 1;

-       DIR *dirstream1 = NULL, *dirstream2 = NULL;
-
-       if (check_argc_exact(argc, 2))
-               usage(cmd_subvol_show_usage);
-
-       fullpath = realpath(argv[1], NULL);
-       if (!fullpath) {
-               fprintf(stderr, "ERROR: finding real path for '%s', %s\n",
-                       argv[1], strerror(errno));
-               goto out;
-       }
+       DIR *dirstream1 = NULL;
+       int by_rootid = 0;
+       int by_uuid = 0;
+       u64 rootid_arg;
+       u8 uuid_arg[BTRFS_UUID_SIZE];

 
 

-       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;
-       }
+       while (1) {
+               int c;
+               static const struct option long_options[] = {
+                       { "rootid", required_argument, NULL, 'r'},
+                       { "uuid", required_argument, NULL, 'u'},
+                       { NULL, 0, NULL, 0 }
+               };

 
 

-       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 (ret > 0) {
-               fprintf(stderr,
-                       "ERROR: %s doesn't belong to btrfs mount point\n",
-                       fullpath);
-               goto out;
-       }
-       ret = 1;
-       svpath = get_subvol_name(mnt, fullpath);
+               c = getopt_long(argc, argv, "r:u:", long_options, NULL);
+               if (c < 0)
+                       break;

 
 

-       fd = open_file_or_dir(fullpath, &dirstream1);
-       if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", fullpath);
-               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 = btrfs_list_get_path_rootid(fd, &sv_id);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't get rootid for '%s'\n",
-                       fullpath);
-               goto out;
-       }
+       if (check_argc_exact(argc - optind, 1))
+               usage(cmd_subvol_show_usage);

 
 

-       mntfd = open_file_or_dir(mnt, &dirstream2);
-       if (mntfd < 0) {
-               fprintf(stderr, "ERROR: can't access '%s'\n", mnt);
-               goto out;
+       if (by_rootid && by_uuid) {
+               error(
+               "options --rootid and --uuid cannot be used at the same time");
+               usage(cmd_subvol_show_usage);

        }
 
        }
 

-       ret = btrfs_list_get_path_rootid(mntfd, &mntid);
-       if (ret) {
-               fprintf(stderr, "ERROR: can't get rootid for '%s'\n", mnt);
+       memset(&get_ri, 0, sizeof(get_ri));
+       fullpath = realpath(argv[optind], NULL);
+       if (!fullpath) {
+               error("cannot find real path for '%s': %s",
+                       argv[optind], strerror(errno));

                goto out;
        }
 
                goto out;
        }
 

-       if (sv_id == BTRFS_FS_TREE_OBJECTID) {
-               printf("%s is btrfs root\n", fullpath);
-               goto out;
+       if (by_rootid) {
+               ret = get_subvol_info_by_rootid(fullpath, &get_ri, rootid_arg);
+       } else if (by_uuid) {
+               ret = get_subvol_info_by_uuid(fullpath, &get_ri, uuid_arg);
+       } else {
+               ret = get_subvol_info(fullpath, &get_ri);

        }
 
        }
 

-       memset(&get_ri, 0, sizeof(get_ri));
-       get_ri.root_id = sv_id;
-
-       ret = btrfs_get_subvol(mntfd, &get_ri);

        if (ret) {
        if (ret) {

-               fprintf(stderr, "ERROR: can't find '%s'\n",
-                       svpath);
-               goto out;
+               if (ret < 0) {
+                       error("Failed to get subvol info %s: %s",
+                                       fullpath, strerror(-ret));
+               } else {
+                       error("Failed to get subvol info %s: %d",
+                                       fullpath, ret);
+               }
+               return ret;

        }
 
        /* print the info */
        }
 
        /* print the info */

-       printf("%s\n", fullpath);
+       printf("%s\n", get_ri.full_path);

        printf("\tName: \t\t\t%s\n", get_ri.name);
 
        if (uuid_is_null(get_ri.uuid))
                strcpy(uuidparse, "-");
        else
                uuid_unparse(get_ri.uuid, uuidparse);
        printf("\tName: \t\t\t%s\n", get_ri.name);
 
        if (uuid_is_null(get_ri.uuid))
                strcpy(uuidparse, "-");
        else
                uuid_unparse(get_ri.uuid, uuidparse);

-       printf("\tuuid: \t\t\t%s\n", uuidparse);
+       printf("\tUUID: \t\t\t%s\n", uuidparse);

 
        if (uuid_is_null(get_ri.puuid))
                strcpy(uuidparse, "-");
        else
                uuid_unparse(get_ri.puuid, uuidparse);
 
        if (uuid_is_null(get_ri.puuid))
                strcpy(uuidparse, "-");
        else
                uuid_unparse(get_ri.puuid, uuidparse);

-       printf("\tParent uuid: \t\t%s\n", uuidparse);
+       printf("\tParent UUID: \t\t%s\n", uuidparse);
+
+       if (uuid_is_null(get_ri.ruuid))
+               strcpy(uuidparse, "-");
+       else
+               uuid_unparse(get_ri.ruuid, uuidparse);
+       printf("\tReceived UUID: \t\t%s\n", uuidparse);

 
        if (get_ri.otime) {
                struct tm tm;
 
                localtime_r(&get_ri.otime, &tm);
 
        if (get_ri.otime) {
                struct tm tm;
 
                localtime_r(&get_ri.otime, &tm);

-               strftime(tstr, 256, "%Y-%m-%d %X", &tm);
+               strftime(tstr, 256, "%Y-%m-%d %X %z", &tm);

        } else
                strcpy(tstr, "-");
        printf("\tCreation time: \t\t%s\n", tstr);
 
        } else
                strcpy(tstr, "-");
        printf("\tCreation time: \t\t%s\n", tstr);
 

-       printf("\tObject ID: \t\t%llu\n", get_ri.root_id);
-       printf("\tGeneration (Gen): \t%llu\n", get_ri.gen);
+       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("\tGen at creation: \t%llu\n", get_ri.ogen);

-       printf("\tParent: \t\t%llu\n", get_ri.ref_tree);
-       printf("\tTop Level: \t\t%llu\n", get_ri.top_id);
+       printf("\tParent ID: \t\t%llu\n", get_ri.ref_tree);
+       printf("\tTop level ID: \t\t%llu\n", get_ri.top_id);

 
        if (get_ri.flags & BTRFS_ROOT_SUBVOL_RDONLY)
                printf("\tFlags: \t\t\treadonly\n");
 
        if (get_ri.flags & BTRFS_ROOT_SUBVOL_RDONLY)
                printf("\tFlags: \t\t\treadonly\n");


@@ -999,19 +1111,23 @@ static int cmd_subvol_show(int argc, char **argv)
        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_setup_filter(&filter_set, BTRFS_LIST_FILTER_BY_PARENT,
                                (u64)(unsigned long)get_ri.uuid);
        btrfs_list_setup_print_column(BTRFS_LIST_PATH);

+
+       fd = open_file_or_dir(fullpath, &dirstream1);
+       if (fd < 0) {
+               fprintf(stderr, "ERROR: can't access '%s'\n", fullpath);
+               goto out;
+       }

        btrfs_list_subvols_print(fd, filter_set, NULL, BTRFS_LIST_LAYOUT_RAW,
                        1, raw_prefix);
 
        btrfs_list_subvols_print(fd, filter_set, NULL, BTRFS_LIST_LAYOUT_RAW,
                        1, raw_prefix);
 

+out:

        /* clean up */
        free(get_ri.path);
        free(get_ri.name);
        free(get_ri.full_path);
        /* clean up */
        free(get_ri.path);
        free(get_ri.name);
        free(get_ri.full_path);

-       btrfs_list_free_filter_set(filter_set);
+       free(filter_set);

 
 

-out:

        close_file_or_dir(fd, dirstream1);
        close_file_or_dir(fd, dirstream1);

-       close_file_or_dir(mntfd, dirstream2);
-       free(mnt);

        free(fullpath);
        return !!ret;
 }
        free(fullpath);
        return !!ret;
 }


@@ -1021,41 +1137,15 @@ static const char * const cmd_subvol_sync_usage[] = {
        "Wait until given subvolume(s) are completely removed from the filesystem.",
        "Wait until given subvolume(s) are completely removed from the filesystem",
        "after deletion.",
        "Wait until given subvolume(s) are completely removed from the filesystem.",
        "Wait until given subvolume(s) are completely removed from the filesystem",
        "after deletion.",

-       "If no subvolume id is given, wait until all ongoing deletion requests",
-       "are complete. This may take long if new deleted subvolumes appear during",
-       "the sleep interval.",
+       "If no subvolume id is given, wait until all current deletion requests",
+       "are completed, but do not wait for subvolumes deleted meanwhile.",
+       "The status of subvolume ids is checked periodically.",

        "",
        "-s <N>       sleep N seconds between checks (default: 1)",
        NULL
 };
 
        "",
        "-s <N>       sleep N seconds between checks (default: 1)",
        NULL
 };
 

-static int is_subvolume_cleaned(int fd, u64 subvolid)
-{
-       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;
-}
-
+#if 0

 /*
  * If we're looking for any dead subvolume, take a shortcut and look
  * for any ORPHAN_ITEMs in the tree root
 /*
  * If we're looking for any dead subvolume, take a shortcut and look
  * for any ORPHAN_ITEMs in the tree root


@@ -1119,6 +1209,86 @@ again:
 
        return 1;
 }
 
        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 (btrfs_search_header_type(sh)
+                           == BTRFS_ORPHAN_ITEM_KEY) {
+                               if (idx >= count) {
+                                       u64 *newids;
+
+                                       count += SUBVOL_ID_BATCH;
+                                       newids = (u64*)realloc(*ids,
+                                                       count * sizeof(u64));
+                                       if (!newids)
+                                               return -ENOMEM;
+                                       *ids = newids;
+                               }
+                               (*ids)[idx] = btrfs_search_header_offset(sh);
+                               idx++;
+                       }
+                       off += btrfs_search_header_len(sh);
+
+                       sk->min_objectid = btrfs_search_header_objectid(sh);
+                       sk->min_type = btrfs_search_header_type(sh);
+                       sk->min_offset = btrfs_search_header_offset(sh);
+               }
+               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)
 {
 
 static int cmd_subvol_sync(int argc, char **argv)
 {


@@ -1128,10 +1298,8 @@ static int cmd_subvol_sync(int argc, char **argv)
        DIR *dirstream = NULL;
        u64 *ids = NULL;
        int id_count;
        DIR *dirstream = NULL;
        u64 *ids = NULL;
        int id_count;

-       int remaining;

        int sleep_interval = 1;
 
        int sleep_interval = 1;
 

-       optind = 1;

        while (1) {
                int c = getopt(argc, argv, "s:");
 
        while (1) {
                int c = getopt(argc, argv, "s:");
 


@@ -1140,11 +1308,9 @@ static int cmd_subvol_sync(int argc, char **argv)
 
                switch (c) {
                case 's':
 
                switch (c) {
                case 's':

-                       sleep_interval = atoi(argv[optind]);
+                       sleep_interval = atoi(optarg);

                        if (sleep_interval < 1) {
                        if (sleep_interval < 1) {

-                               fprintf(stderr,
-                                       "ERROR: invalid sleep interval %s\n",
-                                       argv[optind]);
+                               error("invalid sleep interval %s", optarg);

                                ret = 1;
                                goto out;
                        }
                                ret = 1;
                                goto out;
                        }


@@ -1157,89 +1323,58 @@ static int cmd_subvol_sync(int argc, char **argv)
        if (check_argc_min(argc - optind, 1))
                usage(cmd_subvol_sync_usage);
 
        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) {
        if (fd < 0) {

-               fprintf(stderr, "ERROR: can't access '%s'\n", argv[optind]);

                ret = 1;
                goto out;
        }
        optind++;
 
        id_count = argc - optind;
                ret = 1;
                goto out;
        }
        optind++;
 
        id_count = argc - optind;

-
-       /*
-        * Wait for all
-        */

        if (!id_count) {
        if (!id_count) {

-               while (1) {
-                       ret = fs_has_dead_subvolumes(fd);
-                       if (ret < 0) {
-                               fprintf(stderr, "ERROR: can't perform the search - %s\n",
-                                               strerror(-ret));
-                               ret = 1;
-                               goto out;
-                       }
-                       if (!ret)
-                               goto out;
-                       sleep(sleep_interval);
-               }
-       }
-
-       /*
-        * Wait only for the requested ones
-        */
-       ids = (u64*)malloc(sizeof(u64) * id_count);
-
-       if (!ids) {
-               fprintf(stderr, "ERROR: not enough memory\n");
-               ret = 1;
-               goto out;
-       }
-
-       for (i = 0; i < id_count; i++) {
-               u64 id;
-               const char *arg;
-
-               arg = argv[optind + i];
-               errno = 0;
-               id = strtoull(arg, NULL, 10);
-               if (errno < 0) {
-                       fprintf(stderr, "ERROR: unrecognized subvolume id %s\n",
-                               arg);
+               id_count = enumerate_dead_subvols(fd, &ids);
+               if (id_count < 0) {
+                       error("can't enumerate dead subvolumes: %s",
+                                       strerror(-id_count));

                        ret = 1;
                        goto out;
                }
                        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_count == 0) {
+                       ret = 0;
+                       goto out;
+               }
+       } else {
+               ids = (u64*)malloc(id_count * sizeof(u64));
+               if (!ids) {
+                       error("not enough memory");

                        ret = 1;
                        goto out;
                }
                        ret = 1;
                        goto out;
                }

-               ids[i] = id;
-       }

 
 

-       remaining = id_count;
-       while (1) {

                for (i = 0; i < id_count; i++) {
                for (i = 0; i < id_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));
+                       u64 id;
+                       const char *arg;
+
+                       arg = argv[optind + i];
+                       errno = 0;
+                       id = strtoull(arg, NULL, 10);
+                       if (errno < 0) {
+                               error("unrecognized subvolume id %s", arg);
+                               ret = 1;

                                goto out;
                        }
                                goto out;
                        }

-                       if (ret) {
-                               printf("Subvolume id %llu is gone\n", ids[i]);
-                               ids[i] = 0;
-                               remaining--;
+                       if (id < BTRFS_FIRST_FREE_OBJECTID
+                                       || id > BTRFS_LAST_FREE_OBJECTID) {
+                               error("subvolume id %s out of range", arg);
+                               ret = 1;
+                               goto out;

                        }
                        }

+                       ids[i] = id;

                }
                }

-               if (!remaining)
-                       break;
-               sleep(sleep_interval);

        }
 
        }
 

+       ret = wait_for_subvolume_cleaning(fd, id_count, ids, sleep_interval);
+

 out:
        free(ids);
        close_file_or_dir(fd, dirstream);
 out:
        free(ids);
        close_file_or_dir(fd, dirstream);


@@ -1247,17 +1382,22 @@ out:
        return !!ret;
 }
 
        return !!ret;
 }
 

+static const char subvolume_cmd_group_info[] =
+"manage subvolumes: create, delete, list, etc";
+

 const struct cmd_group subvolume_cmd_group = {
 const struct cmd_group subvolume_cmd_group = {

-       subvolume_cmd_group_usage, NULL, {
+       subvolume_cmd_group_usage, subvolume_cmd_group_info, {

                { "create", cmd_subvol_create, cmd_subvol_create_usage, NULL, 0 },
                { "delete", cmd_subvol_delete, cmd_subvol_delete_usage, NULL, 0 },
                { "list", cmd_subvol_list, cmd_subvol_list_usage, NULL, 0 },
                { "create", cmd_subvol_create, cmd_subvol_create_usage, NULL, 0 },
                { "delete", cmd_subvol_delete, cmd_subvol_delete_usage, NULL, 0 },
                { "list", cmd_subvol_list, cmd_subvol_list_usage, NULL, 0 },

-               { "snapshot", cmd_snapshot, cmd_snapshot_usage, NULL, 0 },
+               { "snapshot", cmd_subvol_snapshot, cmd_subvol_snapshot_usage,
+                       NULL, 0 },

                { "get-default", cmd_subvol_get_default,
                        cmd_subvol_get_default_usage, NULL, 0 },
                { "set-default", cmd_subvol_set_default,
                        cmd_subvol_set_default_usage, NULL, 0 },
                { "get-default", cmd_subvol_get_default,
                        cmd_subvol_get_default_usage, NULL, 0 },
                { "set-default", cmd_subvol_set_default,
                        cmd_subvol_set_default_usage, NULL, 0 },

-               { "find-new", cmd_find_new, cmd_find_new_usage, NULL, 0 },
+               { "find-new", cmd_subvol_find_new, cmd_subvol_find_new_usage,
+                       NULL, 0 },

                { "show", cmd_subvol_show, cmd_subvol_show_usage, NULL, 0 },
                { "sync", cmd_subvol_sync, cmd_subvol_sync_usage, NULL, 0 },
                NULL_CMD_STRUCT
                { "show", cmd_subvol_show, cmd_subvol_show_usage, NULL, 0 },
                { "sync", cmd_subvol_sync, cmd_subvol_sync_usage, NULL, 0 },
                NULL_CMD_STRUCT