btrfs-progs: convert: Fix inline file extent creation condition
[platform/upstream/btrfs-progs.git] / btrfs-list.c
index 201f378..e01c589 100644 (file)
  * Boston, MA 021110-1307, USA.
  */
 
-#define _GNU_SOURCE
-#ifndef __CHECKER__
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include "ioctl.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include "ctree.h"
 #include "transaction.h"
 #include "utils.h"
+#include "ioctl.h"
 #include <uuid/uuid.h>
 #include "btrfs-list.h"
+#include "rbtree-utils.h"
 
 #define BTRFS_LIST_NFILTERS_INCREASE   (2 * BTRFS_LIST_FILTER_MAX)
 #define BTRFS_LIST_NCOMPS_INCREASE     (2 * BTRFS_LIST_COMP_MAX)
@@ -46,53 +44,7 @@ struct root_lookup {
        struct rb_root root;
 };
 
-/*
- * one of these for each root we find.
- */
-struct root_info {
-       struct rb_node rb_node;
-       struct rb_node sort_node;
-
-       /* this root's id */
-       u64 root_id;
-
-       /* equal the offset of the root's key */
-       u64 root_offset;
-
-       /* flags of the root */
-       u64 flags;
-
-       /* the id of the root that references this one */
-       u64 ref_tree;
-
-       /* the dir id we're in from ref_tree */
-       u64 dir_id;
-
-       u64 top_id;
-
-       /* generation when the root is created or last updated */
-       u64 gen;
-
-       /* creation generation of this root in sec*/
-       u64 ogen;
-
-       /* creation time of this root in sec*/
-       time_t otime;
-
-       u8 uuid[BTRFS_UUID_SIZE];
-
-       /* path from the subvol we live in to this root, including the
-        * root's name.  This is null until we do the extra lookup ioctl.
-        */
-       char *path;
-
-       /* the name of this root in the directory it lives in */
-       char *name;
-
-       char *full_path;
-};
-
-struct {
+static struct {
        char    *name;
        char    *column_name;
        int     need_print;
@@ -100,12 +52,12 @@ struct {
        {
                .name           = "ID",
                .column_name    = "ID",
-               .need_print     = 1,
+               .need_print     = 0,
        },
        {
                .name           = "gen",
                .column_name    = "Gen",
-               .need_print     = 1,
+               .need_print     = 0,
        },
        {
                .name           = "cgen",
@@ -120,7 +72,7 @@ struct {
        {
                .name           = "top level",
                .column_name    = "Top Level",
-               .need_print     = 1,
+               .need_print     = 0,
        },
        {
                .name           = "otime",
@@ -128,6 +80,16 @@ struct {
                .need_print     = 0,
        },
        {
+               .name           = "parent_uuid",
+               .column_name    = "Parent UUID",
+               .need_print     = 0,
+       },
+       {
+               .name           = "received_uuid",
+               .column_name    = "Received UUID",
+               .need_print     = 0,
+       },
+       {
                .name           = "uuid",
                .column_name    = "UUID",
                .need_print     = 0,
@@ -135,7 +97,7 @@ struct {
        {
                .name           = "path",
                .column_name    = "Path",
-               .need_print     = 1,
+               .need_print     = 0,
        },
        {
                .name           = NULL,
@@ -151,7 +113,7 @@ void btrfs_list_setup_print_column(enum btrfs_list_column_enum column)
 {
        int i;
 
-       BUG_ON(column < 0 || column > BTRFS_LIST_ALL);
+       ASSERT(0 <= column && column <= BTRFS_LIST_ALL);
 
        if (column < BTRFS_LIST_ALL) {
                btrfs_list_columns[column].need_print = 1;
@@ -162,11 +124,6 @@ void btrfs_list_setup_print_column(enum btrfs_list_column_enum column)
                btrfs_list_columns[i].need_print = 1;
 }
 
-static void root_lookup_init(struct root_lookup *tree)
-{
-       tree->root.rb_node = NULL;
-}
-
 static int comp_entry_with_rootid(struct root_info *entry1,
                                  struct root_info *entry2,
                                  int is_descending)
@@ -215,12 +172,48 @@ static int comp_entry_with_ogen(struct root_info *entry1,
        return is_descending ? -ret : ret;
 }
 
+static int comp_entry_with_path(struct root_info *entry1,
+                               struct root_info *entry2,
+                               int is_descending)
+{
+       int ret;
+
+       if (strcmp(entry1->full_path, entry2->full_path) > 0)
+               ret = 1;
+       else if (strcmp(entry1->full_path, entry2->full_path) < 0)
+               ret = -1;
+       else
+               ret = 0;
+
+       return is_descending ? -ret : ret;
+}
+
 static btrfs_list_comp_func all_comp_funcs[] = {
        [BTRFS_LIST_COMP_ROOTID]        = comp_entry_with_rootid,
        [BTRFS_LIST_COMP_OGEN]          = comp_entry_with_ogen,
        [BTRFS_LIST_COMP_GEN]           = comp_entry_with_gen,
+       [BTRFS_LIST_COMP_PATH]          = comp_entry_with_path,
 };
 
+static char *all_sort_items[] = {
+       [BTRFS_LIST_COMP_ROOTID]        = "rootid",
+       [BTRFS_LIST_COMP_OGEN]          = "ogen",
+       [BTRFS_LIST_COMP_GEN]           = "gen",
+       [BTRFS_LIST_COMP_PATH]          = "path",
+       [BTRFS_LIST_COMP_MAX]           = NULL,
+};
+
+static int  btrfs_list_get_sort_item(char *sort_name)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_LIST_COMP_MAX; i++) {
+               if (strcmp(sort_name, all_sort_items[i]) == 0)
+                       return i;
+       }
+       return -1;
+}
+
 struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void)
 {
        struct btrfs_list_comparer_set *set;
@@ -228,40 +221,37 @@ struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void)
 
        size = sizeof(struct btrfs_list_comparer_set) +
               BTRFS_LIST_NCOMPS_INCREASE * sizeof(struct btrfs_list_comparer);
-       set = malloc(size);
+       set = calloc(1, size);
        if (!set) {
                fprintf(stderr, "memory allocation failed\n");
                exit(1);
        }
 
-       memset(set, 0, size);
        set->total = BTRFS_LIST_NCOMPS_INCREASE;
 
        return set;
 }
 
-void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set)
-{
-       free(comp_set);
-}
-
-int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
-                             enum btrfs_list_comp_enum comparer,
-                             int is_descending)
+static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set,
+               enum btrfs_list_comp_enum comparer, int is_descending)
 {
        struct btrfs_list_comparer_set *set = *comp_set;
        int size;
 
-       BUG_ON(!set);
-       BUG_ON(comparer >= BTRFS_LIST_COMP_MAX);
-       BUG_ON(set->ncomps > set->total);
+       ASSERT(set != NULL);
+       ASSERT(comparer < BTRFS_LIST_COMP_MAX);
+       ASSERT(set->ncomps <= set->total);
 
        if (set->ncomps == set->total) {
+               void *tmp;
+
                size = set->total + BTRFS_LIST_NCOMPS_INCREASE;
                size = sizeof(*set) + size * sizeof(struct btrfs_list_comparer);
+               tmp = set;
                set = realloc(set, size);
                if (!set) {
                        fprintf(stderr, "memory allocation failed\n");
+                       free(tmp);
                        exit(1);
                }
 
@@ -272,7 +262,7 @@ int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
                *comp_set = set;
        }
 
-       BUG_ON(set->comps[set->ncomps].comp_func);
+       ASSERT(set->comps[set->ncomps].comp_func == NULL);
 
        set->comps[set->ncomps].comp_func = all_comp_funcs[comparer];
        set->comps[set->ncomps].is_descending = is_descending;
@@ -287,7 +277,7 @@ static int sort_comp(struct root_info *entry1, struct root_info *entry2,
        int i, ret = 0;
 
        if (!set || !set->ncomps)
-               goto comp_rootid;
+               return comp_entry_with_rootid(entry1, entry2, 0);
 
        for (i = 0; i < set->ncomps; i++) {
                if (!set->comps[i].comp_func)
@@ -302,10 +292,8 @@ static int sort_comp(struct root_info *entry1, struct root_info *entry2,
                        rootid_compared = 1;
        }
 
-       if (!rootid_compared) {
-comp_rootid:
+       if (!rootid_compared)
                ret = comp_entry_with_rootid(entry1, entry2, 0);
-       }
 
        return ret;
 }
@@ -399,7 +387,7 @@ static struct root_info *root_tree_search(struct root_lookup *root_tree,
 static int update_root(struct root_lookup *root_lookup,
                       u64 root_id, u64 ref_tree, u64 root_offset, u64 flags,
                       u64 dir_id, char *name, int name_len, u64 ogen, u64 gen,
-                      time_t ot, void *uuid)
+                      time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid)
 {
        struct root_info *ri;
 
@@ -407,8 +395,7 @@ static int update_root(struct root_lookup *root_lookup,
        if (!ri || ri->root_id != root_id)
                return -ENOENT;
        if (name && name_len > 0) {
-               if (ri->name)
-                       free(ri->name);
+               free(ri->name);
 
                ri->name = malloc(name_len + 1);
                if (!ri->name) {
@@ -432,10 +419,14 @@ static int update_root(struct root_lookup *root_lookup,
                ri->ogen = ogen;
        if (!ri->ogen && root_offset)
                ri->ogen = root_offset;
-       if (ot)
-               ri->otime = ot;
+       if (otime)
+               ri->otime = otime;
        if (uuid)
                memcpy(&ri->uuid, uuid, BTRFS_UUID_SIZE);
+       if (puuid)
+               memcpy(&ri->puuid, puuid, BTRFS_UUID_SIZE);
+       if (ruuid)
+               memcpy(&ri->ruuid, ruuid, BTRFS_UUID_SIZE);
 
        return 0;
 }
@@ -451,28 +442,30 @@ static int update_root(struct root_lookup *root_lookup,
  * name_len: the length of name
  * ogen: the original generation of the root
  * gen: the current generation of the root
- * ot: the original time(create time) of the root
+ * otime: the original time (creation time) of the root
  * uuid: uuid of the root
+ * puuid: uuid of the root parent if any
+ * ruuid: uuid of the received subvol, if any
  */
 static int add_root(struct root_lookup *root_lookup,
                    u64 root_id, u64 ref_tree, u64 root_offset, u64 flags,
                    u64 dir_id, char *name, int name_len, u64 ogen, u64 gen,
-                   time_t ot, void *uuid)
+                   time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid)
 {
        struct root_info *ri;
        int ret;
 
        ret = update_root(root_lookup, root_id, ref_tree, root_offset, flags,
-                         dir_id, name, name_len, ogen, gen, ot, uuid);
+                         dir_id, name, name_len, ogen, gen, otime,
+                         uuid, puuid, ruuid);
        if (!ret)
                return 0;
 
-       ri = malloc(sizeof(*ri));
+       ri = calloc(1, sizeof(*ri));
        if (!ri) {
                printf("memory allocation failed\n");
                exit(1);
        }
-       memset(ri, 0, sizeof(*ri));
        ri->root_id = root_id;
 
        if (name && name_len > 0) {
@@ -498,47 +491,48 @@ static int add_root(struct root_lookup *root_lookup,
                ri->ogen = ogen;
        if (!ri->ogen && root_offset)
                ri->ogen = root_offset;
-       if (ot)
-               ri->otime = ot;
+       if (otime)
+               ri->otime = otime;
 
-       if (uuid) 
+       if (uuid)
                memcpy(&ri->uuid, uuid, BTRFS_UUID_SIZE);
 
+       if (puuid)
+               memcpy(&ri->puuid, puuid, BTRFS_UUID_SIZE);
+
+       if (ruuid)
+               memcpy(&ri->ruuid, ruuid, BTRFS_UUID_SIZE);
+
        ret = root_tree_insert(root_lookup, ri);
-       if (ret) {
-               printf("failed to insert tree %llu\n", (unsigned long long)root_id);
+       if (ret < 0) {
+               error("failed to insert subvolume %llu to tree: %s",
+                               (unsigned long long)root_id, strerror(-ret));
                exit(1);
        }
        return 0;
 }
 
-void __free_root_info(struct root_info *ri)
+/*
+ * Simplified add_root for back references, omits the uuid and original info
+ * parameters, root offset and flags.
+ */
+static int add_root_backref(struct root_lookup *root_lookup, u64 root_id,
+               u64 ref_tree, u64 dir_id, char *name, int name_len)
 {
-       if (ri->name)
-               free(ri->name);
-
-       if (ri->path)
-               free(ri->path);
-
-       if (ri->full_path)
-               free(ri->full_path);
-
-       free(ri);
+       return add_root(root_lookup, root_id, ref_tree, 0, 0, dir_id, name,
+                       name_len, 0, 0, 0, NULL, NULL, NULL);
 }
 
-void __free_all_subvolumn(struct root_lookup *root_tree)
-{
-       struct root_info *entry;
-       struct rb_node *n;
 
-       n = rb_first(&root_tree->root);
-       while (n) {
-               entry = rb_entry(n, struct root_info, rb_node);
-               rb_erase(n, &root_tree->root);
-               __free_root_info(entry);
+static void free_root_info(struct rb_node *node)
+{
+       struct root_info *ri;
 
-               n = rb_first(&root_tree->root);
-       }
+       ri = rb_entry(node, struct root_info, rb_node);
+       free(ri->name);
+       free(ri->path);
+       free(ri->full_path);
+       free(ri);
 }
 
 /*
@@ -548,7 +542,8 @@ void __free_all_subvolumn(struct root_lookup *root_tree)
  * This can't be called until all the root_info->path fields are filled
  * in by lookup_ino_path
  */
-static int resolve_root(struct root_lookup *rl, struct root_info *ri)
+static int resolve_root(struct root_lookup *rl, struct root_info *ri,
+                      u64 top_id)
 {
        char *full_path = NULL;
        int len = 0;
@@ -562,15 +557,26 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
        while (1) {
                char *tmp;
                u64 next;
-               int add_len = strlen(found->path);
+               int add_len;
 
-               /* room for / and for null */
-               tmp = malloc(add_len + 2 + len);
-               if (!tmp) {
-                       perror("malloc failed");
-                       exit(1);
+               /*
+                * ref_tree = 0 indicates the subvolume
+                * has been deleted.
+                */
+               if (!found->ref_tree) {
+                       free(full_path);
+                       return -ENOENT;
                }
+
+               add_len = strlen(found->path);
+
                if (full_path) {
+                       /* room for / and for null */
+                       tmp = malloc(add_len + 2 + len);
+                       if (!tmp) {
+                               perror("malloc failed");
+                               exit(1);
+                       }
                        memcpy(tmp + add_len + 1, full_path, len);
                        tmp[add_len] = '/';
                        memcpy(tmp, found->path, add_len);
@@ -582,23 +588,26 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
                        full_path = strdup(found->path);
                        len = add_len;
                }
+               if (!ri->top_id)
+                       ri->top_id = found->ref_tree;
 
                next = found->ref_tree;
-
-               /* if the ref_tree refers to ourselves, we're at the top */
-               if (next == found->root_id) {
-                       ri->top_id = next;
+               if (next == top_id)
                        break;
-               }
-
                /*
-                * if the ref_tree wasn't in our tree of roots, we're
-                * at the top
-                */
+               * if the ref_tree = BTRFS_FS_TREE_OBJECTID,
+               * we are at the top
+               */
+               if (next == BTRFS_FS_TREE_OBJECTID)
+                       break;
+               /*
+               * if the ref_tree wasn't in our tree of roots, the
+               * subvolume was deleted.
+               */
                found = root_tree_search(rl, next);
                if (!found) {
-                       ri->top_id = next;
-                       break;
+                       free(full_path);
+                       return -ENOENT;
                }
        }
 
@@ -617,21 +626,26 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
 static int lookup_ino_path(int fd, struct root_info *ri)
 {
        struct btrfs_ioctl_ino_lookup_args args;
-       int ret, e;
+       int ret;
 
        if (ri->path)
                return 0;
 
+       if (!ri->ref_tree)
+               return -ENOENT;
+
        memset(&args, 0, sizeof(args));
        args.treeid = ri->ref_tree;
        args.objectid = ri->dir_id;
 
        ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args);
-       e = errno;
-       if (ret) {
-               fprintf(stderr, "ERROR: Failed to lookup path for root %llu - %s\n",
-                       (unsigned long long)ri->ref_tree,
-                       strerror(e));
+       if (ret < 0) {
+               if (errno == ENOENT) {
+                       ri->ref_tree = 0;
+                       return -ENOENT;
+               }
+               error("failed to lookup path for root %llu: %m",
+                       (unsigned long long)ri->ref_tree);
                return ret;
        }
 
@@ -659,7 +673,7 @@ static int lookup_ino_path(int fd, struct root_info *ri)
 }
 
 /* finding the generation for a given path is a two step process.
- * First we use the inode loookup routine to find out the root id
+ * First we use the inode lookup routine to find out the root id
  *
  * Then we use the tree search ioctl to scan all the root items for a
  * given root id and spit out the latest generation we can find
@@ -670,28 +684,25 @@ static u64 find_root_gen(int fd)
        int ret;
        struct btrfs_ioctl_search_args args;
        struct btrfs_ioctl_search_key *sk = &args.key;
-       struct btrfs_ioctl_search_header *sh;
+       struct btrfs_ioctl_search_header sh;
        unsigned long off = 0;
        u64 max_found = 0;
        int i;
-       int e;
 
        memset(&ino_args, 0, sizeof(ino_args));
        ino_args.objectid = BTRFS_FIRST_FREE_OBJECTID;
 
        /* this ioctl fills in ino_args->treeid */
        ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &ino_args);
-       e = errno;
-       if (ret) {
-               fprintf(stderr, "ERROR: Failed to lookup path for dirid %llu - %s\n",
-                       (unsigned long long)BTRFS_FIRST_FREE_OBJECTID,
-                       strerror(e));
+       if (ret < 0) {
+               error("failed to lookup path for dirid %llu: %m",
+                       (unsigned long long)BTRFS_FIRST_FREE_OBJECTID);
                return 0;
        }
 
        memset(&args, 0, sizeof(args));
 
-       sk->tree_id = 1;
+       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
 
        /*
         * there may be more than one ROOT_ITEM key if there are
@@ -708,10 +719,8 @@ static u64 find_root_gen(int fd)
 
        while (1) {
                ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-               e = errno;
                if (ret < 0) {
-                       fprintf(stderr, "ERROR: can't perform the search - %s\n",
-                               strerror(e));
+                       error("can't perform the search: %m");
                        return 0;
                }
                /* the ioctl returns the number of item it found in nr_items */
@@ -721,22 +730,21 @@ static u64 find_root_gen(int fd)
                off = 0;
                for (i = 0; i < sk->nr_items; i++) {
                        struct btrfs_root_item *item;
-                       sh = (struct btrfs_ioctl_search_header *)(args.buf +
-                                                                 off);
 
-                       off += sizeof(*sh);
+                       memcpy(&sh, args.buf + off, sizeof(sh));
+                       off += sizeof(sh);
                        item = (struct btrfs_root_item *)(args.buf + off);
-                       off += sh->len;
+                       off += sh.len;
 
-                       sk->min_objectid = sh->objectid;
-                       sk->min_type = sh->type;
-                       sk->min_offset = sh->offset;
+                       sk->min_objectid = sh.objectid;
+                       sk->min_type = sh.type;
+                       sk->min_offset = sh.offset;
 
-                       if (sh->objectid > ino_args.treeid)
+                       if (sh.objectid > ino_args.treeid)
                                break;
 
-                       if (sh->objectid == ino_args.treeid &&
-                           sh->type == BTRFS_ROOT_ITEM_KEY) {
+                       if (sh.objectid == ino_args.treeid &&
+                           sh.type == BTRFS_ROOT_ITEM_KEY) {
                                max_found = max(max_found,
                                                btrfs_root_generation(item));
                        }
@@ -748,7 +756,7 @@ static u64 find_root_gen(int fd)
 
                if (sk->min_type != BTRFS_ROOT_ITEM_KEY)
                        break;
-               if (sk->min_objectid != BTRFS_ROOT_ITEM_KEY)
+               if (sk->min_objectid != ino_args.treeid)
                        break;
        }
        return max_found;
@@ -766,16 +774,14 @@ static char *__ino_resolve(int fd, u64 dirid)
        struct btrfs_ioctl_ino_lookup_args args;
        int ret;
        char *full;
-       int e;
 
        memset(&args, 0, sizeof(args));
        args.objectid = dirid;
 
        ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args);
-       e = errno;
-       if (ret) {
-               fprintf(stderr, "ERROR: Failed to lookup path for dirid %llu - %s\n",
-                       (unsigned long long)dirid, strerror(e) );
+       if (ret < 0) {
+               error("failed to lookup path for dirid %llu: %m",
+                       (unsigned long long)dirid);
                return ERR_PTR(ret);
        }
 
@@ -800,9 +806,10 @@ static char *__ino_resolve(int fd, u64 dirid)
  * simple string builder, returning a new string with both
  * dirid and name
  */
-char *build_name(char *dirid, char *name)
+static char *build_name(const char *dirid, const char *name)
 {
        char *full;
+
        if (!dirid)
                return strdup(name);
 
@@ -833,7 +840,6 @@ static char *ino_resolve(int fd, u64 ino, u64 *cache_dirid, char **cache_name)
        struct btrfs_ioctl_search_header *sh;
        unsigned long off = 0;
        int namelen;
-       int e;
 
        memset(&args, 0, sizeof(args));
 
@@ -852,10 +858,8 @@ static char *ino_resolve(int fd, u64 ino, u64 *cache_dirid, char **cache_name)
        sk->nr_items = 1;
 
        ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-       e = errno;
        if (ret < 0) {
-               fprintf(stderr, "ERROR: can't perform the search - %s\n",
-                       strerror(e));
+               error("can't perform the search: %m");
                return NULL;
        }
        /* the ioctl returns the number of item it found in nr_items */
@@ -865,9 +869,9 @@ static char *ino_resolve(int fd, u64 ino, u64 *cache_dirid, char **cache_name)
        off = 0;
        sh = (struct btrfs_ioctl_search_header *)(args.buf + off);
 
-       if (sh->type == BTRFS_INODE_REF_KEY) {
+       if (btrfs_search_header_type(sh) == BTRFS_INODE_REF_KEY) {
                struct btrfs_inode_ref *ref;
-               dirid = sh->offset;
+               dirid = btrfs_search_header_offset(sh);
 
                ref = (struct btrfs_inode_ref *)(sh + 1);
                namelen = btrfs_stack_inode_ref_name_len(ref);
@@ -914,7 +918,7 @@ int btrfs_list_get_default_subvolume(int fd, u64 *default_id)
         * search for a dir item with a name 'default' in the tree of
         * tree roots, it should point us to a default root
         */
-       sk->tree_id = 1;
+       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
 
        /* don't worry about ancient format and request only one item */
        sk->nr_items = 1;
@@ -936,7 +940,7 @@ int btrfs_list_get_default_subvolume(int fd, u64 *default_id)
 
        sh = (struct btrfs_ioctl_search_header *)args.buf;
 
-       if (sh->type == BTRFS_DIR_ITEM_KEY) {
+       if (btrfs_search_header_type(sh) == BTRFS_DIR_ITEM_KEY) {
                struct btrfs_dir_item *di;
                int name_len;
                char *name;
@@ -954,15 +958,15 @@ out:
        return 0;
 }
 
-static int __list_subvol_search(int fd, struct root_lookup *root_lookup)
+static int list_subvol_search(int fd, struct root_lookup *root_lookup)
 {
        int ret;
        struct btrfs_ioctl_search_args args;
        struct btrfs_ioctl_search_key *sk = &args.key;
-       struct btrfs_ioctl_search_header *sh;
+       struct btrfs_ioctl_search_header sh;
        struct btrfs_root_ref *ref;
        struct btrfs_root_item *ri;
-       unsigned long off = 0;
+       unsigned long off;
        int name_len;
        char *name;
        u64 dir_id;
@@ -970,40 +974,24 @@ static int __list_subvol_search(int fd, struct root_lookup *root_lookup)
        u64 ogen;
        u64 flags;
        int i;
-       time_t t;
-       u8 uuid[BTRFS_UUID_SIZE];
 
-       root_lookup_init(root_lookup);
+       root_lookup->root.rb_node = NULL;
        memset(&args, 0, sizeof(args));
 
-       /* search in the tree of tree roots */
-       sk->tree_id = 1;
-
-       /*
-        * set the min and max to backref keys.  The search will
-        * only send back this type of key now.
-        */
-       sk->max_type = BTRFS_ROOT_BACKREF_KEY;
+       sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
+       /* Search both live and deleted subvolumes */
        sk->min_type = BTRFS_ROOT_ITEM_KEY;
-
-       sk->min_objectid = BTRFS_FIRST_FREE_OBJECTID;
-
-       /*
-        * set all the other params to the max, we'll take any objectid
-        * and any trans
-        */
+       sk->max_type = BTRFS_ROOT_BACKREF_KEY;
+       sk->min_objectid = BTRFS_FS_TREE_OBJECTID;
        sk->max_objectid = BTRFS_LAST_FREE_OBJECTID;
        sk->max_offset = (u64)-1;
        sk->max_transid = (u64)-1;
 
-       /* just a big number, doesn't matter much */
-       sk->nr_items = 4096;
-
        while(1) {
+               sk->nr_items = 4096;
                ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
                if (ret < 0)
                        return ret;
-               /* the ioctl returns the number of item it found in nr_items */
                if (sk->nr_items == 0)
                        break;
 
@@ -1014,51 +1002,56 @@ static int __list_subvol_search(int fd, struct root_lookup *root_lookup)
                 * read the root_ref item it contains
                 */
                for (i = 0; i < sk->nr_items; i++) {
-                       sh = (struct btrfs_ioctl_search_header *)(args.buf +
-                                                                 off);
-                       off += sizeof(*sh);
-                       if (sh->type == BTRFS_ROOT_BACKREF_KEY) {
+                       memcpy(&sh, args.buf + off, sizeof(sh));
+                       off += sizeof(sh);
+                       if (sh.type == BTRFS_ROOT_BACKREF_KEY) {
                                ref = (struct btrfs_root_ref *)(args.buf + off);
                                name_len = btrfs_stack_root_ref_name_len(ref);
                                name = (char *)(ref + 1);
                                dir_id = btrfs_stack_root_ref_dirid(ref);
 
-                               add_root(root_lookup, sh->objectid, sh->offset,
-                                        0, 0, dir_id, name, name_len, 0, 0, 0,
-                                        NULL);
-                       } else if (sh->type == BTRFS_ROOT_ITEM_KEY) {
+                               add_root_backref(root_lookup, sh.objectid,
+                                               sh.offset, dir_id, name,
+                                               name_len);
+                       } else if (sh.type == BTRFS_ROOT_ITEM_KEY &&
+                                  (sh.objectid >= BTRFS_FIRST_FREE_OBJECTID ||
+                                   sh.objectid == BTRFS_FS_TREE_OBJECTID)) {
+                               time_t otime;
+                               u8 uuid[BTRFS_UUID_SIZE];
+                               u8 puuid[BTRFS_UUID_SIZE];
+                               u8 ruuid[BTRFS_UUID_SIZE];
+
                                ri = (struct btrfs_root_item *)(args.buf + off);
                                gen = btrfs_root_generation(ri);
                                flags = btrfs_root_flags(ri);
-                               if(sh->len >
+                               if(sh.len >
                                   sizeof(struct btrfs_root_item_v0)) {
-                                       t = ri->otime.sec;
+                                       otime = btrfs_stack_timespec_sec(&ri->otime);
                                        ogen = btrfs_root_otransid(ri);
                                        memcpy(uuid, ri->uuid, BTRFS_UUID_SIZE);
+                                       memcpy(puuid, ri->parent_uuid, BTRFS_UUID_SIZE);
+                                       memcpy(ruuid, ri->received_uuid, BTRFS_UUID_SIZE);
                                } else {
-                                       t = 0;
+                                       otime = 0;
                                        ogen = 0;
                                        memset(uuid, 0, BTRFS_UUID_SIZE);
+                                       memset(puuid, 0, BTRFS_UUID_SIZE);
+                                       memset(ruuid, 0, BTRFS_UUID_SIZE);
                                }
 
-                               add_root(root_lookup, sh->objectid, 0,
-                                        sh->offset, flags, 0, NULL, 0, ogen,
-                                        gen, t, uuid);
+                               add_root(root_lookup, sh.objectid, 0,
+                                        sh.offset, flags, 0, NULL, 0, ogen,
+                                        gen, otime, uuid, puuid, ruuid);
                        }
 
-                       off += sh->len;
+                       off += sh.len;
 
-                       /*
-                        * record the mins in sk so we can make sure the
-                        * next search doesn't repeat this root
-                        */
-                       sk->min_objectid = sh->objectid;
-                       sk->min_type = sh->type;
-                       sk->min_offset = sh->offset;
+                       sk->min_objectid = sh.objectid;
+                       sk->min_type = sh.type;
+                       sk->min_offset = sh.offset;
                }
-               sk->nr_items = 4096;
                sk->min_offset++;
-               if (!sk->min_offset)    /* overflow */
+               if (!sk->min_offset)
                        sk->min_type++;
                else
                        continue;
@@ -1091,10 +1084,88 @@ static int filter_flags(struct root_info *ri, u64 flags)
        return ri->flags & flags;
 }
 
+static int filter_gen_more(struct root_info *ri, u64 data)
+{
+       return ri->gen >= data;
+}
+
+static int filter_gen_less(struct root_info *ri, u64 data)
+{
+       return ri->gen <= data;
+}
+
+static int filter_gen_equal(struct root_info  *ri, u64 data)
+{
+       return ri->gen == data;
+}
+
+static int filter_cgen_more(struct root_info *ri, u64 data)
+{
+       return ri->ogen >= data;
+}
+
+static int filter_cgen_less(struct root_info *ri, u64 data)
+{
+       return ri->ogen <= data;
+}
+
+static int filter_cgen_equal(struct root_info *ri, u64 data)
+{
+       return ri->ogen == data;
+}
+
+static int filter_topid_equal(struct root_info *ri, u64 data)
+{
+       return ri->top_id == data;
+}
+
+static int filter_full_path(struct root_info *ri, u64 data)
+{
+       if (ri->full_path && ri->top_id != data) {
+               char *tmp;
+               char p[] = "<FS_TREE>";
+               int add_len = strlen(p);
+               int len = strlen(ri->full_path);
+
+               tmp = malloc(len + add_len + 2);
+               if (!tmp) {
+                       fprintf(stderr, "memory allocation failed\n");
+                       exit(1);
+               }
+               memcpy(tmp + add_len + 1, ri->full_path, len);
+               tmp[len + add_len + 1] = '\0';
+               tmp[add_len] = '/';
+               memcpy(tmp, p, add_len);
+               free(ri->full_path);
+               ri->full_path = tmp;
+       }
+       return 1;
+}
+
+static int filter_by_parent(struct root_info *ri, u64 data)
+{
+       return !uuid_compare(ri->puuid, (u8 *)(unsigned long)data);
+}
+
+static int filter_deleted(struct root_info *ri, u64 data)
+{
+       return ri->deleted;
+}
+
 static btrfs_list_filter_func all_filter_funcs[] = {
        [BTRFS_LIST_FILTER_ROOTID]              = filter_by_rootid,
        [BTRFS_LIST_FILTER_SNAPSHOT_ONLY]       = filter_snapshot,
        [BTRFS_LIST_FILTER_FLAGS]               = filter_flags,
+       [BTRFS_LIST_FILTER_GEN_MORE]            = filter_gen_more,
+       [BTRFS_LIST_FILTER_GEN_LESS]            = filter_gen_less,
+       [BTRFS_LIST_FILTER_GEN_EQUAL]           = filter_gen_equal,
+       [BTRFS_LIST_FILTER_CGEN_MORE]           = filter_cgen_more,
+       [BTRFS_LIST_FILTER_CGEN_LESS]           = filter_cgen_less,
+       [BTRFS_LIST_FILTER_CGEN_EQUAL]          = filter_cgen_equal,
+       [BTRFS_LIST_FILTER_TOPID_EQUAL]         = filter_topid_equal,
+       [BTRFS_LIST_FILTER_FULL_PATH]           = filter_full_path,
+       [BTRFS_LIST_FILTER_BY_PARENT]           = filter_by_parent,
+       [BTRFS_LIST_FILTER_DELETED]             = filter_deleted,
 };
 
 struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void)
@@ -1104,39 +1175,41 @@ struct btrfs_list_filter_set *btrfs_list_alloc_filter_set(void)
 
        size = sizeof(struct btrfs_list_filter_set) +
               BTRFS_LIST_NFILTERS_INCREASE * sizeof(struct btrfs_list_filter);
-       set = malloc(size);
+       set = calloc(1, size);
        if (!set) {
                fprintf(stderr, "memory allocation failed\n");
                exit(1);
        }
 
-       memset(set, 0, size);
        set->total = BTRFS_LIST_NFILTERS_INCREASE;
 
        return set;
 }
 
-void btrfs_list_free_filter_set(struct btrfs_list_filter_set *filter_set)
-{
-       free(filter_set);
-}
-
-int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
+/*
+ * Setup list filters. Exit if there's not enough memory, as we can't continue
+ * without the structures set up properly.
+ */
+void btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
                            enum btrfs_list_filter_enum filter, u64 data)
 {
        struct btrfs_list_filter_set *set = *filter_set;
        int size;
 
-       BUG_ON(!set);
-       BUG_ON(filter >= BTRFS_LIST_FILTER_MAX);
-       BUG_ON(set->nfilters > set->total);
+       ASSERT(set != NULL);
+       ASSERT(filter < BTRFS_LIST_FILTER_MAX);
+       ASSERT(set->nfilters <= set->total);
 
        if (set->nfilters == set->total) {
+               void *tmp;
+
                size = set->total + BTRFS_LIST_NFILTERS_INCREASE;
                size = sizeof(*set) + size * sizeof(struct btrfs_list_filter);
+               tmp = set;
                set = realloc(set, size);
                if (!set) {
                        fprintf(stderr, "memory allocation failed\n");
+                       free(tmp);
                        exit(1);
                }
 
@@ -1147,12 +1220,14 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
                *filter_set = set;
        }
 
-       BUG_ON(set->filters[set->nfilters].filter_func);
+       ASSERT(set->filters[set->nfilters].filter_func == NULL);
+
+       if (filter == BTRFS_LIST_FILTER_DELETED)
+               set->only_deleted = 1;
 
        set->filters[set->nfilters].filter_func = all_filter_funcs[filter];
        set->filters[set->nfilters].data = data;
        set->nfilters++;
-       return 0;
 }
 
 static int filter_root(struct root_info *ri,
@@ -1160,9 +1235,15 @@ static int filter_root(struct root_info *ri,
 {
        int i, ret;
 
-       if (!set || !set->nfilters)
+       if (!set)
                return 1;
 
+       if (set->only_deleted && !ri->deleted)
+               return 0;
+
+       if (!set->only_deleted && ri->deleted)
+               return 0;
+
        for (i = 0; i < set->nfilters; i++) {
                if (!set->filters[i].filter_func)
                        break;
@@ -1173,22 +1254,37 @@ static int filter_root(struct root_info *ri,
        return 1;
 }
 
-static void __filter_and_sort_subvol(struct root_lookup *all_subvols,
+static void filter_and_sort_subvol(struct root_lookup *all_subvols,
                                    struct root_lookup *sort_tree,
                                    struct btrfs_list_filter_set *filter_set,
-                                   struct btrfs_list_comparer_set *comp_set)
+                                   struct btrfs_list_comparer_set *comp_set,
+                                   u64 top_id)
 {
        struct rb_node *n;
        struct root_info *entry;
        int ret;
 
-       root_lookup_init(sort_tree);
+       sort_tree->root.rb_node = NULL;
 
        n = rb_last(&all_subvols->root);
        while (n) {
                entry = rb_entry(n, struct root_info, rb_node);
 
-               resolve_root(all_subvols, entry);
+               ret = resolve_root(all_subvols, entry, top_id);
+               if (ret == -ENOENT) {
+                       if (entry->root_id != BTRFS_FS_TREE_OBJECTID) {
+                               entry->full_path = strdup("DELETED");
+                               entry->deleted = 1;
+                       } else {
+                               /*
+                                * The full path is not supposed to be printed,
+                                * but we don't want to print an empty string,
+                                * in case it appears somewhere.
+                                */
+                               entry->full_path = strdup("TOPLEVEL");
+                               entry->deleted = 0;
+                       }
+               }
                ret = filter_root(entry, filter_set);
                if (ret)
                        sort_tree_insert(sort_tree, entry, comp_set);
@@ -1196,7 +1292,7 @@ static void __filter_and_sort_subvol(struct root_lookup *all_subvols,
        }
 }
 
-static int __list_subvol_fill_paths(int fd, struct root_lookup *root_lookup)
+static int list_subvol_fill_paths(int fd, struct root_lookup *root_lookup)
 {
        struct rb_node *n;
 
@@ -1206,7 +1302,7 @@ static int __list_subvol_fill_paths(int fd, struct root_lookup *root_lookup)
                int ret;
                entry = rb_entry(n, struct root_info, rb_node);
                ret = lookup_ino_path(fd, entry);
-               if(ret < 0)
+               if (ret && ret != -ENOENT)
                        return ret;
                n = rb_next(n);
        }
@@ -1218,9 +1314,9 @@ static void print_subvolume_column(struct root_info *subv,
                                   enum btrfs_list_column_enum column)
 {
        char tstr[256];
-       char uuidparse[37];
+       char uuidparse[BTRFS_UUID_UNPARSED_SIZE];
 
-       BUG_ON(column >= BTRFS_LIST_ALL || column < 0);
+       ASSERT(0 <= column && column < BTRFS_LIST_ALL);
 
        switch (column) {
        case BTRFS_LIST_OBJECTID:
@@ -1239,10 +1335,12 @@ static void print_subvolume_column(struct root_info *subv,
                printf("%llu", subv->top_id);
                break;
        case BTRFS_LIST_OTIME:
-               if (subv->otime)
-                       strftime(tstr, 256, "%Y-%m-%d %X",
-                                localtime(&subv->otime));
-               else
+               if (subv->otime) {
+                       struct tm tm;
+
+                       localtime_r(&subv->otime, &tm);
+                       strftime(tstr, 256, "%Y-%m-%d %X", &tm);
+               } else
                        strcpy(tstr, "-");
                printf("%s", tstr);
                break;
@@ -1251,7 +1349,21 @@ static void print_subvolume_column(struct root_info *subv,
                        strcpy(uuidparse, "-");
                else
                        uuid_unparse(subv->uuid, uuidparse);
-               printf("%s", uuidparse);
+               printf("%-36s", uuidparse);
+               break;
+       case BTRFS_LIST_PUUID:
+               if (uuid_is_null(subv->puuid))
+                       strcpy(uuidparse, "-");
+               else
+                       uuid_unparse(subv->puuid, uuidparse);
+               printf("%-36s", uuidparse);
+               break;
+       case BTRFS_LIST_RUUID:
+               if (uuid_is_null(subv->ruuid))
+                       strcpy(uuidparse, "-");
+               else
+                       uuid_unparse(subv->ruuid, uuidparse);
+               printf("%-36s", uuidparse);
                break;
        case BTRFS_LIST_PATH:
                BUG_ON(!subv->full_path);
@@ -1262,7 +1374,43 @@ static void print_subvolume_column(struct root_info *subv,
        }
 }
 
-static void print_single_volume_info_default(struct root_info *subv)
+static void print_one_subvol_info_raw(struct root_info *subv,
+               const char *raw_prefix)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_LIST_ALL; i++) {
+               if (!btrfs_list_columns[i].need_print)
+                       continue;
+
+               if (raw_prefix)
+                       printf("%s",raw_prefix);
+
+               print_subvolume_column(subv, i);
+       }
+       printf("\n");
+}
+
+static void print_one_subvol_info_table(struct root_info *subv)
+{
+       int i;
+
+       for (i = 0; i < BTRFS_LIST_ALL; i++) {
+               if (!btrfs_list_columns[i].need_print)
+                       continue;
+
+               print_subvolume_column(subv, i);
+
+               if (i != BTRFS_LIST_PATH)
+                       printf("\t");
+
+               if (i == BTRFS_LIST_TOP_LEVEL)
+                       printf("\t");
+       }
+       printf("\n");
+}
+
+static void print_one_subvol_info_default(struct root_info *subv)
 {
        int i;
 
@@ -1279,30 +1427,75 @@ static void print_single_volume_info_default(struct root_info *subv)
        printf("\n");
 }
 
-static void print_all_volume_info_default(struct root_lookup *sorted_tree)
+static void print_all_subvol_info_tab_head(void)
+{
+       int i;
+       int len;
+       char barrier[20];
+
+       for (i = 0; i < BTRFS_LIST_ALL; i++) {
+               if (btrfs_list_columns[i].need_print)
+                       printf("%s\t", btrfs_list_columns[i].name);
+
+               if (i == BTRFS_LIST_ALL-1)
+                       printf("\n");
+       }
+
+       for (i = 0; i < BTRFS_LIST_ALL; i++) {
+               memset(barrier, 0, sizeof(barrier));
+
+               if (btrfs_list_columns[i].need_print) {
+                       len = strlen(btrfs_list_columns[i].name);
+                       while (len--)
+                               strcat(barrier, "-");
+
+                       printf("%s\t", barrier);
+               }
+               if (i == BTRFS_LIST_ALL-1)
+                       printf("\n");
+       }
+}
+
+static void print_all_subvol_info(struct root_lookup *sorted_tree,
+                 enum btrfs_list_layout layout, const char *raw_prefix)
 {
        struct rb_node *n;
        struct root_info *entry;
 
+       if (layout == BTRFS_LIST_LAYOUT_TABLE)
+               print_all_subvol_info_tab_head();
+
        n = rb_first(&sorted_tree->root);
        while (n) {
                entry = rb_entry(n, struct root_info, sort_node);
-               print_single_volume_info_default(entry);
+
+               /* The toplevel subvolume is not listed by default */
+               if (entry->root_id == BTRFS_FS_TREE_OBJECTID)
+                       goto next;
+
+               switch (layout) {
+               case BTRFS_LIST_LAYOUT_DEFAULT:
+                       print_one_subvol_info_default(entry);
+                       break;
+               case BTRFS_LIST_LAYOUT_TABLE:
+                       print_one_subvol_info_table(entry);
+                       break;
+               case BTRFS_LIST_LAYOUT_RAW:
+                       print_one_subvol_info_raw(entry, raw_prefix);
+                       break;
+               }
+next:
                n = rb_next(n);
        }
 }
 
-int btrfs_list_subvols(int fd, struct btrfs_list_filter_set *filter_set,
-                      struct btrfs_list_comparer_set *comp_set)
+static int btrfs_list_subvols(int fd, struct root_lookup *root_lookup)
 {
-       struct root_lookup root_lookup;
-       struct root_lookup root_sort;
        int ret;
 
-       ret = __list_subvol_search(fd, &root_lookup);
+       ret = list_subvol_search(fd, root_lookup);
        if (ret) {
-               fprintf(stderr, "ERROR: can't perform the search - %s\n",
-                               strerror(errno));
+               error("can't perform the search: %m");
                return ret;
        }
 
@@ -1310,15 +1503,113 @@ int btrfs_list_subvols(int fd, struct btrfs_list_filter_set *filter_set,
         * now we have an rbtree full of root_info objects, but we need to fill
         * in their path names within the subvol that is referencing each one.
         */
-       ret = __list_subvol_fill_paths(fd, &root_lookup);
-       if (ret < 0)
+       ret = list_subvol_fill_paths(fd, root_lookup);
+       return ret;
+}
+
+int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
+                      struct btrfs_list_comparer_set *comp_set,
+                      enum btrfs_list_layout layout, int full_path,
+                      const char *raw_prefix)
+{
+       struct root_lookup root_lookup;
+       struct root_lookup root_sort;
+       int ret = 0;
+       u64 top_id = 0;
+
+       if (full_path)
+               ret = btrfs_list_get_path_rootid(fd, &top_id);
+       if (ret)
+               return ret;
+
+       ret = btrfs_list_subvols(fd, &root_lookup);
+       if (ret)
+               return ret;
+       filter_and_sort_subvol(&root_lookup, &root_sort, filter_set,
+                                comp_set, top_id);
+
+       print_all_subvol_info(&root_sort, layout, raw_prefix);
+       rb_free_nodes(&root_lookup.root, free_root_info);
+
+       return 0;
+}
+
+static char *strdup_or_null(const char *s)
+{
+       if (!s)
+               return NULL;
+       return strdup(s);
+}
+
+int btrfs_get_toplevel_subvol(int fd, struct root_info *the_ri)
+{
+       int ret;
+       struct root_lookup rl;
+       struct rb_node *rbn;
+       struct root_info *ri;
+       u64 root_id;
+
+       ret = btrfs_list_get_path_rootid(fd, &root_id);
+       if (ret)
+               return ret;
+
+       ret = btrfs_list_subvols(fd, &rl);
+       if (ret)
+               return ret;
+
+       rbn = rb_first(&rl.root);
+       ri = rb_entry(rbn, struct root_info, rb_node);
+
+       if (ri->root_id != BTRFS_FS_TREE_OBJECTID)
+               return -ENOENT;
+
+       memcpy(the_ri, ri, offsetof(struct root_info, path));
+       the_ri->path = strdup_or_null("/");
+       the_ri->name = strdup_or_null("<FS_TREE>");
+       the_ri->full_path = strdup_or_null("/");
+       rb_free_nodes(&rl.root, free_root_info);
+
+       return ret;
+}
+
+int btrfs_get_subvol(int fd, struct root_info *the_ri)
+{
+       int ret, rr;
+       struct root_lookup rl;
+       struct rb_node *rbn;
+       struct root_info *ri;
+       u64 root_id;
+
+       ret = btrfs_list_get_path_rootid(fd, &root_id);
+       if (ret)
+               return ret;
+
+       ret = btrfs_list_subvols(fd, &rl);
+       if (ret)
                return ret;
 
-       __filter_and_sort_subvol(&root_lookup, &root_sort, filter_set,
-                                comp_set);
+       rbn = rb_first(&rl.root);
+       while(rbn) {
+               ri = rb_entry(rbn, struct root_info, rb_node);
+               rr = resolve_root(&rl, ri, root_id);
+               if (rr == -ENOENT) {
+                       ret = -ENOENT;
+                       rbn = rb_next(rbn);
+                       continue;
+               }
 
-       print_all_volume_info_default(&root_sort);
-       __free_all_subvolumn(&root_lookup);
+               if (!comp_entry_with_rootid(the_ri, ri, 0) ||
+                       !uuid_compare(the_ri->uuid, ri->uuid)) {
+                       memcpy(the_ri, ri, offsetof(struct root_info, path));
+                       the_ri->path = strdup_or_null(ri->path);
+                       the_ri->name = strdup_or_null(ri->name);
+                       the_ri->full_path = strdup_or_null(ri->full_path);
+                       ret = 0;
+                       break;
+               }
+               rbn = rb_next(rbn);
+       }
+       rb_free_nodes(&rl.root, free_root_info);
        return ret;
 }
 
@@ -1336,17 +1627,18 @@ static int print_one_extent(int fd, struct btrfs_ioctl_search_header *sh,
        int flags = 0;
        char *name = NULL;
 
-       if (sh->objectid == *cache_ino) {
+       if (btrfs_search_header_objectid(sh) == *cache_ino) {
                name = *cache_full_name;
        } else if (*cache_full_name) {
                free(*cache_full_name);
                *cache_full_name = NULL;
        }
        if (!name) {
-               name = ino_resolve(fd, sh->objectid, cache_dirid,
+               name = ino_resolve(fd, btrfs_search_header_objectid(sh),
+                                  cache_dirid,
                                   cache_dir_name);
                *cache_full_name = name;
-               *cache_ino = sh->objectid;
+               *cache_ino = btrfs_search_header_objectid(sh);
        }
        if (!name)
                return -EIO;
@@ -1364,19 +1656,19 @@ static int print_one_extent(int fd, struct btrfs_ioctl_search_header *sh,
                disk_offset = 0;
                len = btrfs_stack_file_extent_ram_bytes(item);
        } else {
-               printf("unhandled extent type %d for inode %llu "
-                      "file offset %llu gen %llu\n",
+               error(
+       "unhandled extent type %d for inode %llu file offset %llu gen %llu",
                        type,
-                       (unsigned long long)sh->objectid,
-                       (unsigned long long)sh->offset,
+                       (unsigned long long)btrfs_search_header_objectid(sh),
+                       (unsigned long long)btrfs_search_header_offset(sh),
                        (unsigned long long)found_gen);
 
                return -EIO;
        }
        printf("inode %llu file offset %llu len %llu disk start %llu "
               "offset %llu gen %llu flags ",
-              (unsigned long long)sh->objectid,
-              (unsigned long long)sh->offset,
+              (unsigned long long)btrfs_search_header_objectid(sh),
+              (unsigned long long)btrfs_search_header_offset(sh),
               (unsigned long long)len,
               (unsigned long long)disk_start,
               (unsigned long long)disk_offset,
@@ -1406,13 +1698,12 @@ int btrfs_list_find_updated_files(int fd, u64 root_id, u64 oldest_gen)
        int ret;
        struct btrfs_ioctl_search_args args;
        struct btrfs_ioctl_search_key *sk = &args.key;
-       struct btrfs_ioctl_search_header *sh;
+       struct btrfs_ioctl_search_header sh;
        struct btrfs_file_extent_item *item;
        unsigned long off = 0;
        u64 found_gen;
        u64 max_found = 0;
        int i;
-       int e;
        u64 cache_dirid = 0;
        u64 cache_ino = 0;
        char *cache_dir_name = NULL;
@@ -1439,11 +1730,9 @@ int btrfs_list_find_updated_files(int fd, u64 root_id, u64 oldest_gen)
        max_found = find_root_gen(fd);
        while(1) {
                ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-               e = errno;
                if (ret < 0) {
-                       fprintf(stderr, "ERROR: can't perform the search- %s\n",
-                               strerror(e));
-                       return ret;
+                       error("can't perform the search: %m");
+                       break;
                }
                /* the ioctl returns the number of item it found in nr_items */
                if (sk->nr_items == 0)
@@ -1456,35 +1745,34 @@ int btrfs_list_find_updated_files(int fd, u64 root_id, u64 oldest_gen)
                 * read the root_ref item it contains
                 */
                for (i = 0; i < sk->nr_items; i++) {
-                       sh = (struct btrfs_ioctl_search_header *)(args.buf +
-                                                                 off);
-                       off += sizeof(*sh);
+                       memcpy(&sh, args.buf + off, sizeof(sh));
+                       off += sizeof(sh);
 
                        /*
                         * just in case the item was too big, pass something other
                         * than garbage
                         */
-                       if (sh->len == 0)
+                       if (sh.len == 0)
                                item = &backup;
                        else
                                item = (struct btrfs_file_extent_item *)(args.buf +
                                                                 off);
                        found_gen = btrfs_stack_file_extent_generation(item);
-                       if (sh->type == BTRFS_EXTENT_DATA_KEY &&
+                       if (sh.type == BTRFS_EXTENT_DATA_KEY &&
                            found_gen >= oldest_gen) {
-                               print_one_extent(fd, sh, item, found_gen,
+                               print_one_extent(fd, &sh, item, found_gen,
                                                 &cache_dirid, &cache_dir_name,
                                                 &cache_ino, &cache_full_name);
                        }
-                       off += sh->len;
+                       off += sh.len;
 
                        /*
                         * record the mins in sk so we can make sure the
                         * next search doesn't repeat this root
                         */
-                       sk->min_objectid = sh->objectid;
-                       sk->min_offset = sh->offset;
-                       sk->min_type = sh->type;
+                       sk->min_objectid = sh.objectid;
+                       sk->min_offset = sh.offset;
+                       sk->min_type = sh.type;
                }
                sk->nr_items = 4096;
                if (sk->min_offset < (u64)-1)
@@ -1508,12 +1796,17 @@ char *btrfs_list_path_for_root(int fd, u64 root)
        struct rb_node *n;
        char *ret_path = NULL;
        int ret;
+       u64 top_id;
+
+       ret = btrfs_list_get_path_rootid(fd, &top_id);
+       if (ret)
+               return ERR_PTR(ret);
 
-       ret = __list_subvol_search(fd, &root_lookup);
+       ret = list_subvol_search(fd, &root_lookup);
        if (ret < 0)
                return ERR_PTR(ret);
 
-       ret = __list_subvol_fill_paths(fd, &root_lookup);
+       ret = list_subvol_fill_paths(fd, &root_lookup);
        if (ret < 0)
                return ERR_PTR(ret);
 
@@ -1522,7 +1815,11 @@ char *btrfs_list_path_for_root(int fd, u64 root)
                struct root_info *entry;
 
                entry = rb_entry(n, struct root_info, rb_node);
-               resolve_root(&root_lookup, entry);
+               ret = resolve_root(&root_lookup, entry, top_id);
+               if (ret == -ENOENT && entry->root_id == root) {
+                       ret_path = NULL;
+                       break;
+               }
                if (entry->root_id == root) {
                        ret_path = entry->full_path;
                        entry->full_path = NULL;
@@ -1530,7 +1827,105 @@ char *btrfs_list_path_for_root(int fd, u64 root)
 
                n = rb_prev(n);
        }
-       __free_all_subvolumn(&root_lookup);
+       rb_free_nodes(&root_lookup.root, free_root_info);
 
        return ret_path;
 }
+
+int btrfs_list_parse_sort_string(char *opt_arg,
+                                struct btrfs_list_comparer_set **comps)
+{
+       int order;
+       int flag;
+       char *p;
+       char **ptr_argv;
+       int what_to_sort;
+
+       while ((p = strtok(opt_arg, ",")) != NULL) {
+               flag = 0;
+               ptr_argv = all_sort_items;
+
+               while (*ptr_argv) {
+                       if (strcmp(*ptr_argv, p) == 0) {
+                               flag = 1;
+                               break;
+                       } else {
+                               p++;
+                               if (strcmp(*ptr_argv, p) == 0) {
+                                       flag = 1;
+                                       p--;
+                                       break;
+                               }
+                               p--;
+                       }
+                       ptr_argv++;
+               }
+
+               if (flag == 0)
+                       return -1;
+
+               else {
+                       if (*p == '+') {
+                               order = 0;
+                               p++;
+                       } else if (*p == '-') {
+                               order = 1;
+                               p++;
+                       } else
+                               order = 0;
+
+                       what_to_sort = btrfs_list_get_sort_item(p);
+                       btrfs_list_setup_comparer(comps, what_to_sort, order);
+               }
+               opt_arg = NULL;
+       }
+
+       return 0;
+}
+
+/*
+ * This function is used to parse the argument of filter condition.
+ *
+ * type is the filter object.
+ */
+int btrfs_list_parse_filter_string(char *opt_arg,
+                                  struct btrfs_list_filter_set **filters,
+                                  enum btrfs_list_filter_enum type)
+{
+
+       u64 arg;
+
+       switch (*(opt_arg++)) {
+       case '+':
+               arg = arg_strtou64(opt_arg);
+               type += 2;
+
+               btrfs_list_setup_filter(filters, type, arg);
+               break;
+       case '-':
+               arg = arg_strtou64(opt_arg);
+               type += 1;
+
+               btrfs_list_setup_filter(filters, type, arg);
+               break;
+       default:
+               opt_arg--;
+               arg = arg_strtou64(opt_arg);
+
+               btrfs_list_setup_filter(filters, type, arg);
+               break;
+       }
+
+       return 0;
+}
+
+int btrfs_list_get_path_rootid(int fd, u64 *treeid)
+{
+       int ret;
+
+       ret = lookup_path_rootid(fd, treeid);
+       if (ret < 0)
+               error("cannot resolve rootid for path: %m");
+
+       return ret;
+}