btrfs-progs: fix wrong max system array size check in user space
[platform/upstream/btrfs-progs.git] / cmds-subvolume.c
index 3b4edb6..5e821c7 100644 (file)
@@ -24,6 +24,7 @@
 #include <libgen.h>
 #include <limits.h>
 #include <getopt.h>
+#include <uuid/uuid.h>
 
 #include "kerncompat.h"
 #include "ioctl.h"
@@ -31,7 +32,9 @@
 
 #include "ctree.h"
 #include "commands.h"
+#include "utils.h"
 #include "btrfs-list.h"
+#include "utils.h"
 
 static const char * const subvolume_cmd_group_usage[] = {
        "btrfs subvolume <command> <args>",
@@ -58,37 +61,48 @@ static int test_isdir(char *path)
 }
 
 static const char * const cmd_subvol_create_usage[] = {
-       "btrfs subvolume create [<dest>/]<name>",
+       "btrfs subvolume create [-i <qgroupid>] [<dest>/]<name>",
        "Create a subvolume",
        "Create a subvolume <name> in <dest>.  If <dest> is not given",
        "subvolume <name> will be created in the current directory.",
+       "",
+       "-i <qgroupid>  add the newly created subvolume to a qgroup. This",
+       "               option can be given multiple times.",
        NULL
 };
 
 static int cmd_subvol_create(int argc, char **argv)
 {
-       int     res, fddst, len, e;
+       int     retval, res, len;
+       int     fddst = -1;
+       char    *dupname = NULL;
+       char    *dupdir = NULL;
        char    *newname;
        char    *dstdir;
        char    *dst;
        struct btrfs_qgroup_inherit *inherit = NULL;
+       DIR     *dirstream = NULL;
 
        optind = 1;
        while (1) {
-               int c = getopt(argc, argv, "c:i:r");
+               int c = getopt(argc, argv, "c:i:");
                if (c < 0)
                        break;
 
                switch (c) {
                case 'c':
                        res = qgroup_inherit_add_copy(&inherit, optarg, 0);
-                       if (res)
-                               return res;
+                       if (res) {
+                               retval = res;
+                               goto out;
+                       }
                        break;
                case 'i':
                        res = qgroup_inherit_add_group(&inherit, optarg);
-                       if (res)
-                               return res;
+                       if (res) {
+                               retval = res;
+                               goto out;
+                       }
                        break;
                default:
                        usage(cmd_subvol_create_usage);
@@ -100,35 +114,36 @@ static int cmd_subvol_create(int argc, char **argv)
 
        dst = argv[optind];
 
+       retval = 1;     /* failure */
        res = test_isdir(dst);
-       if(res >= 0 ){
+       if (res >= 0) {
                fprintf(stderr, "ERROR: '%s' exists\n", dst);
-               return 12;
+               goto out;
        }
 
-       newname = strdup(dst);
-       newname = basename(newname);
-       dstdir = strdup(dst);
-       dstdir = dirname(dstdir);
+       dupname = strdup(dst);
+       newname = basename(dupname);
+       dupdir = strdup(dst);
+       dstdir = dirname(dupdir);
 
-       if( !strcmp(newname,".") || !strcmp(newname,"..") ||
+       if (!strcmp(newname, ".") || !strcmp(newname, "..") ||
             strchr(newname, '/') ){
                fprintf(stderr, "ERROR: uncorrect subvolume name ('%s')\n",
                        newname);
-               return 14;
+               goto out;
        }
 
        len = strlen(newname);
        if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
                fprintf(stderr, "ERROR: subvolume name too long ('%s)\n",
                        newname);
-               return 14;
+               goto out;
        }
 
-       fddst = open_file_or_dir(dstdir);
+       fddst = open_file_or_dir(dstdir, &dirstream);
        if (fddst < 0) {
-               fprintf(stderr, "ERROR: can't access to '%s'\n", dstdir);
-               return 12;
+               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+               goto out;
        }
 
        printf("Create subvolume '%s/%s'\n", dstdir, newname);
@@ -136,8 +151,7 @@ static int cmd_subvol_create(int argc, char **argv)
                struct btrfs_ioctl_vol_args_v2  args;
 
                memset(&args, 0, sizeof(args));
-               strncpy(args.name, newname, BTRFS_SUBVOL_NAME_MAX);
-               args.name[BTRFS_SUBVOL_NAME_MAX-1] = 0;
+               strncpy_null(args.name, newname);
                args.flags |= BTRFS_SUBVOL_QGROUP_INHERIT;
                args.size = qgroup_inherit_size(inherit);
                args.qgroup_inherit = inherit;
@@ -147,24 +161,25 @@ static int cmd_subvol_create(int argc, char **argv)
                struct btrfs_ioctl_vol_args     args;
 
                memset(&args, 0, sizeof(args));
-               strncpy(args.name, newname, BTRFS_SUBVOL_NAME_MAX);
-               args.name[BTRFS_SUBVOL_NAME_MAX-1] = 0;
+               strncpy_null(args.name, newname);
 
                res = ioctl(fddst, BTRFS_IOC_SUBVOL_CREATE, &args);
        }
 
-       e = errno;
-
-       close(fddst);
-
-       if(res < 0 ){
-               fprintf( stderr, "ERROR: cannot create subvolume - %s\n",
-                       strerror(e));
-               return 11;
+       if (res < 0) {
+               fprintf(stderr, "ERROR: cannot create subvolume - %s\n",
+                       strerror(errno));
+               goto out;
        }
+
+       retval = 0;     /* success */
+out:
+       close_file_or_dir(fddst, dirstream);
        free(inherit);
+       free(dupname);
+       free(dupdir);
 
-       return 0;
+       return retval;
 }
 
 /*
@@ -186,95 +201,206 @@ int test_issubvolume(char *path)
        return (st.st_ino == 256) && S_ISDIR(st.st_mode);
 }
 
+static int wait_for_commit(int fd)
+{
+       int ret;
+
+       ret = ioctl(fd, BTRFS_IOC_START_SYNC, NULL);
+       if (ret < 0)
+               return ret;
+       return ioctl(fd, BTRFS_IOC_WAIT_SYNC, NULL);
+}
+
 static const char * const cmd_subvol_delete_usage[] = {
-       "btrfs subvolume delete <name>",
-       "Delete a subvolume",
+       "btrfs subvolume delete [options] <subvolume> [<subvolume>...]",
+       "Delete subvolume(s)",
+       "Delete subvolumes from the filesystem. The corresponding directory",
+       "is removed instantly but the data blocks are removed later.",
+       "The deletion does not involve full commit by default due to",
+       "performance reasons (as a consequence, the subvolume may appear again",
+       "after a crash). Use one of the --commit options to wait until the",
+       "operation is safely stored on the media.",
+       "",
+       "-c|--commit-after      wait for transaction commit at the end of the operation",
+       "-C|--commit-each       wait for transaction commit after deleting each subvolume",
        NULL
 };
 
 static int cmd_subvol_delete(int argc, char **argv)
 {
-       int     res, fd, len, e;
+       int     res, len, e, ret = 0;
+       int cnt;
+       int fd = -1;
        struct btrfs_ioctl_vol_args     args;
        char    *dname, *vname, *cpath;
+       char    *dupdname = NULL;
+       char    *dupvname = NULL;
        char    *path;
+       DIR     *dirstream = NULL;
+       int sync_mode = 0;
+       struct option long_options[] = {
+               {"commit-after", no_argument, NULL, 'c'},  /* sync mode 1 */
+               {"commit-each", no_argument, NULL, 'C'},  /* sync mode 2 */
+               {NULL, 0, NULL, 0}
+       };
 
-       if (check_argc_exact(argc, 2))
+       optind = 1;
+       while (1) {
+               int c;
+
+               c = getopt_long(argc, argv, "cC", long_options, NULL);
+               if (c < 0)
+                       break;
+
+               switch(c) {
+               case 'c':
+                       sync_mode = 1;
+                       break;
+               case 'C':
+                       sync_mode = 2;
+                       break;
+               default:
+                       usage(cmd_subvol_delete_usage);
+               }
+       }
+
+       if (check_argc_min(argc - optind, 1))
                usage(cmd_subvol_delete_usage);
 
-       path = argv[1];
+       printf("Transaction commit: %s\n",
+               !sync_mode ? "none (default)" :
+               sync_mode == 1 ? "at the end" : "after each");
+
+       cnt = optind;
+
+again:
+       path = argv[cnt];
 
        res = test_issubvolume(path);
-       if(res<0){
+       if (res < 0) {
                fprintf(stderr, "ERROR: error accessing '%s'\n", path);
-               return 12;
+               ret = 1;
+               goto out;
        }
-       if(!res){
+       if (!res) {
                fprintf(stderr, "ERROR: '%s' is not a subvolume\n", path);
-               return 13;
+               ret = 1;
+               goto out;
        }
 
-       cpath = realpath(path, 0);
-       dname = strdup(cpath);
-       dname = dirname(dname);
-       vname = strdup(cpath);
-       vname = basename(vname);
+       cpath = realpath(path, NULL);
+       if (!cpath) {
+               ret = errno;
+               fprintf(stderr, "ERROR: finding real path for '%s': %s\n",
+                       path, strerror(errno));
+               goto out;
+       }
+       dupdname = strdup(cpath);
+       dname = dirname(dupdname);
+       dupvname = strdup(cpath);
+       vname = basename(dupvname);
        free(cpath);
 
-       if( !strcmp(vname,".") || !strcmp(vname,"..") ||
-            strchr(vname, '/') ){
+       if (!strcmp(vname, ".") || !strcmp(vname, "..") ||
+            strchr(vname, '/'){
                fprintf(stderr, "ERROR: incorrect subvolume name ('%s')\n",
                        vname);
-               return 14;
+               ret = 1;
+               goto out;
        }
 
        len = strlen(vname);
        if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
                fprintf(stderr, "ERROR: snapshot name too long ('%s)\n",
                        vname);
-               return 14;
+               ret = 1;
+               goto out;
        }
 
-       fd = open_file_or_dir(dname);
+       fd = open_file_or_dir(dname, &dirstream);
        if (fd < 0) {
-               close(fd);
-               fprintf(stderr, "ERROR: can't access to '%s'\n", dname);
-               return 12;
+               fprintf(stderr, "ERROR: can't access '%s'\n", dname);
+               ret = 1;
+               goto out;
        }
 
        printf("Delete subvolume '%s/%s'\n", dname, vname);
-       strncpy(args.name, vname, BTRFS_PATH_NAME_MAX);
-       args.name[BTRFS_PATH_NAME_MAX-1] = 0;
+       strncpy_null(args.name, vname);
        res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
        e = errno;
 
-       close(fd);
-
        if(res < 0 ){
                fprintf( stderr, "ERROR: cannot delete '%s/%s' - %s\n",
                        dname, vname, strerror(e));
-               return 11;
+               ret = 1;
+               goto out;
        }
 
-       return 0;
+       if (sync_mode == 1) {
+               res = wait_for_commit(fd);
+               if (res < 0) {
+                       fprintf(stderr,
+                               "ERROR: unable to wait for commit after '%s': %s\n",
+                               path, strerror(errno));
+                       ret = 1;
+               }
+       }
+
+out:
+       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;
+               goto again;
+       }
+
+       if (sync_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;
+               }
+       }
+       close_file_or_dir(fd, dirstream);
+
+       return ret;
 }
 
+/*
+ * Naming of options:
+ * - uppercase for filters and sort options
+ * - lowercase for enabling specific items in the output
+ */
 static const char * const cmd_subvol_list_usage[] = {
-       "btrfs subvolume list [-apurt] [-s 0|1] [-g [+|-]value] [-c [+|-]value] "
+       "btrfs subvolume list [options] [-G [+|-]value] [-C [+|-]value] "
        "[--sort=gen,ogen,rootid,path] <path>",
        "List subvolumes (and snapshots)",
        "",
        "-p           print parent ID",
-       "-a           print all the subvolumes in the filesystem.",
+       "-a           print all the subvolumes in the filesystem and",
+       "             distinguish absolute and relative path with respect",
+       "             to the given <path>",
+       "-c           print the ogeneration of the subvolume",
+       "-g           print the generation of the subvolume",
+       "-o           print only subvolumes bellow specified path",
        "-u           print the uuid of subvolumes (and snapshots)",
+       "-q           print the parent uuid of the snapshots",
        "-t           print the result as a table",
-       "-s value     list snapshots with generation in ascending/descending order",
-       "             (1: ascending, 0: descending)",
+       "-s           list snapshots only in the filesystem",
        "-r           list readonly subvolumes (including snapshots)",
-       "-g [+|-]value",
+       "-d           list deleted subvolumes that are not yet cleaned",
+       "-G [+|-]value",
        "             filter the subvolumes by generation",
        "             (+value: >= value; -value: <= value; value: = value)",
-       "-c [+|-]value",
+       "-C [+|-]value",
        "             filter the subvolumes by ogeneration",
        "             (+value: >= value; -value: <= value; value: = value)",
        "--sort=gen,ogen,rootid,path",
@@ -289,18 +415,19 @@ static int cmd_subvol_list(int argc, char **argv)
        struct btrfs_list_filter_set *filter_set;
        struct btrfs_list_comparer_set *comparer_set;
        u64 flags = 0;
-       int fd;
+       int fd = -1;
        u64 top_id;
-       int ret;
-       int order;
+       int ret = -1, uerr = 0;
        int c;
        char *subvol;
        int is_tab_result = 0;
        int is_list_all = 0;
+       int is_only_in_path = 0;
        struct option long_options[] = {
                {"sort", 1, NULL, 'S'},
-               {0, 0, 0, 0}
+               {NULL, 0, NULL, 0}
        };
+       DIR *dirstream = NULL;
 
        filter_set = btrfs_list_alloc_filter_set();
        comparer_set = btrfs_list_alloc_comparer_set();
@@ -308,7 +435,7 @@ static int cmd_subvol_list(int argc, char **argv)
        optind = 1;
        while(1) {
                c = getopt_long(argc, argv,
-                                   "aps:urg:c:t", long_options, NULL);
+                                   "acdgopqsurG:C:t", long_options, NULL);
                if (c < 0)
                        break;
 
@@ -319,52 +446,72 @@ static int cmd_subvol_list(int argc, char **argv)
                case 'a':
                        is_list_all = 1;
                        break;
+               case 'c':
+                       btrfs_list_setup_print_column(BTRFS_LIST_OGENERATION);
+                       break;
+               case 'd':
+                       btrfs_list_setup_filter(&filter_set,
+                                               BTRFS_LIST_FILTER_DELETED,
+                                               0);
+                       break;
+               case 'g':
+                       btrfs_list_setup_print_column(BTRFS_LIST_GENERATION);
+                       break;
+               case 'o':
+                       is_only_in_path = 1;
+                       break;
                case 't':
                        is_tab_result = 1;
                        break;
                case 's':
-                       order = atoi(optarg);
                        btrfs_list_setup_filter(&filter_set,
                                                BTRFS_LIST_FILTER_SNAPSHOT_ONLY,
                                                0);
-                       btrfs_list_setup_comparer(&comparer_set,
-                                                 BTRFS_LIST_COMP_OGEN,
-                                                 !order);
                        btrfs_list_setup_print_column(BTRFS_LIST_OGENERATION);
                        btrfs_list_setup_print_column(BTRFS_LIST_OTIME);
-
+                       break;
                case 'u':
                        btrfs_list_setup_print_column(BTRFS_LIST_UUID);
                        break;
+               case 'q':
+                       btrfs_list_setup_print_column(BTRFS_LIST_PUUID);
+                       break;
                case 'r':
                        flags |= BTRFS_ROOT_SUBVOL_RDONLY;
                        break;
-               case 'g':
+               case 'G':
                        btrfs_list_setup_print_column(BTRFS_LIST_GENERATION);
                        ret = btrfs_list_parse_filter_string(optarg,
                                                        &filter_set,
                                                        BTRFS_LIST_FILTER_GEN);
-                       if (ret)
-                               usage(cmd_subvol_list_usage);
+                       if (ret) {
+                               uerr = 1;
+                               goto out;
+                       }
                        break;
 
-               case 'c':
+               case 'C':
                        btrfs_list_setup_print_column(BTRFS_LIST_OGENERATION);
                        ret = btrfs_list_parse_filter_string(optarg,
                                                        &filter_set,
                                                        BTRFS_LIST_FILTER_CGEN);
-                       if (ret)
-                               usage(cmd_subvol_list_usage);
+                       if (ret) {
+                               uerr = 1;
+                               goto out;
+                       }
                        break;
                case 'S':
                        ret = btrfs_list_parse_sort_string(optarg,
                                                           &comparer_set);
-                       if (ret)
-                               usage(cmd_subvol_list_usage);
+                       if (ret) {
+                               uerr = 1;
+                               goto out;
+                       }
                        break;
 
                default:
-                       usage(cmd_subvol_list_usage);
+                       uerr = 1;
+                       goto out;
                }
        }
 
@@ -372,58 +519,87 @@ static int cmd_subvol_list(int argc, char **argv)
                btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_FLAGS,
                                        flags);
 
-       if (check_argc_exact(argc - optind, 1))
-               usage(cmd_subvol_list_usage);
-
-       subvol = argv[optind];
-
-       ret = test_issubvolume(subvol);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               return 12;
-       }
-       if (!ret) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
-               return 13;
+       if (check_argc_exact(argc - optind, 1)) {
+               uerr = 1;
+               goto out;
        }
 
-       fd = open_file_or_dir(subvol);
+       subvol = argv[optind];
+       fd = open_file_or_dir(subvol, &dirstream);
        if (fd < 0) {
+               ret = -1;
                fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
-               return 12;
+               goto out;
        }
 
-       top_id = btrfs_list_get_path_rootid(fd);
-       if (!is_list_all)
+       ret = btrfs_list_get_path_rootid(fd, &top_id);
+       if (ret) {
+               fprintf(stderr, "ERROR: can't get rootid for '%s'\n", subvol);
+               goto out;
+       }
+
+       if (is_list_all)
+               btrfs_list_setup_filter(&filter_set,
+                                       BTRFS_LIST_FILTER_FULL_PATH,
+                                       top_id);
+       else if (is_only_in_path)
                btrfs_list_setup_filter(&filter_set,
                                        BTRFS_LIST_FILTER_TOPID_EQUAL,
                                        top_id);
 
-       ret = btrfs_list_subvols(fd, filter_set, comparer_set,
-                               is_tab_result);
-       if (ret)
-               return 19;
-       return 0;
+       /* by default we shall print the following columns*/
+       btrfs_list_setup_print_column(BTRFS_LIST_OBJECTID);
+       btrfs_list_setup_print_column(BTRFS_LIST_GENERATION);
+       btrfs_list_setup_print_column(BTRFS_LIST_TOP_LEVEL);
+       btrfs_list_setup_print_column(BTRFS_LIST_PATH);
+
+       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);
+
+out:
+       close_file_or_dir(fd, dirstream);
+       if (filter_set)
+               btrfs_list_free_filter_set(filter_set);
+       if (comparer_set)
+               btrfs_list_free_comparer_set(comparer_set);
+       if (uerr)
+               usage(cmd_subvol_list_usage);
+       return !!ret;
 }
 
 static const char * const cmd_snapshot_usage[] = {
-       "btrfs subvolume snapshot [-r] <source> [<dest>/]<name>",
+       "btrfs subvolume snapshot [-r] <source> <dest>|[<dest>/]<name>",
+       "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",
-       "the name <name> in the <dest> directory",
+       "the name <name> in the <dest> directory.  If only <dest> is given,",
+       "the subvolume will be named the basename of <source>.",
        "",
-       "-r     create a readonly snapshot",
+       "-r             create a readonly snapshot",
+       "-i <qgroupid>  add the newly created snapshot to a qgroup. This",
+       "               option can be given multiple times.",
        NULL
 };
 
 static int cmd_snapshot(int argc, char **argv)
 {
        char    *subvol, *dst;
-       int     res, fd, fddst, len, e, readonly = 0;
+       int     res, retval;
+       int     fd = -1, fddst = -1;
+       int     len, readonly = 0;
+       char    *dupname = NULL;
+       char    *dupdir = NULL;
        char    *newname;
        char    *dstdir;
        struct btrfs_ioctl_vol_args_v2  args;
        struct btrfs_qgroup_inherit *inherit = NULL;
+       DIR *dirstream1 = NULL, *dirstream2 = NULL;
 
        optind = 1;
        memset(&args, 0, sizeof(args));
@@ -435,21 +611,27 @@ static int cmd_snapshot(int argc, char **argv)
                switch (c) {
                case 'c':
                        res = qgroup_inherit_add_copy(&inherit, optarg, 0);
-                       if (res)
-                               return res;
+                       if (res) {
+                               retval = res;
+                               goto out;
+                       }
                        break;
                case 'i':
                        res = qgroup_inherit_add_group(&inherit, optarg);
-                       if (res)
-                               return res;
+                       if (res) {
+                               retval = res;
+                               goto out;
+                       }
                        break;
                case 'r':
                        readonly = 1;
                        break;
                case 'x':
                        res = qgroup_inherit_add_copy(&inherit, optarg, 1);
-                       if (res)
-                               return res;
+                       if (res) {
+                               retval = res;
+                               goto out;
+                       }
                        break;
                default:
                        usage(cmd_snapshot_usage);
@@ -462,58 +644,58 @@ static int cmd_snapshot(int argc, char **argv)
        subvol = argv[optind];
        dst = argv[optind + 1];
 
+       retval = 1;     /* failure */
        res = test_issubvolume(subvol);
-       if(res<0){
+       if (res < 0) {
                fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               return 12;
+               goto out;
        }
-       if(!res){
+       if (!res) {
                fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
-               return 13;
+               goto out;
        }
 
        res = test_isdir(dst);
-       if(res == 0 ){
+       if (res == 0) {
                fprintf(stderr, "ERROR: '%s' exists and it is not a directory\n", dst);
-               return 12;
+               goto out;
        }
 
-       if(res>0){
-               newname = strdup(subvol);
-               newname = basename(newname);
+       if (res > 0) {
+               dupname = strdup(subvol);
+               newname = basename(dupname);
                dstdir = dst;
-       }else{
-               newname = strdup(dst);
-               newname = basename(newname);
-               dstdir = strdup(dst);
-               dstdir = dirname(dstdir);
+       } else {
+               dupname = strdup(dst);
+               newname = basename(dupname);
+               dupdir = strdup(dst);
+               dstdir = dirname(dupdir);
        }
 
-       if( !strcmp(newname,".") || !strcmp(newname,"..") ||
+       if (!strcmp(newname, ".") || !strcmp(newname, "..") ||
             strchr(newname, '/') ){
                fprintf(stderr, "ERROR: incorrect snapshot name ('%s')\n",
                        newname);
-               return 14;
+               goto out;
        }
 
        len = strlen(newname);
        if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
                fprintf(stderr, "ERROR: snapshot name too long ('%s)\n",
                        newname);
-               return 14;
+               goto out;
        }
 
-       fddst = open_file_or_dir(dstdir);
+       fddst = open_file_or_dir(dstdir, &dirstream1);
        if (fddst < 0) {
-               fprintf(stderr, "ERROR: can't access to '%s'\n", dstdir);
-               return 12;
+               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+               goto out;
        }
 
-       fd = open_file_or_dir(subvol);
+       fd = open_file_or_dir(subvol, &dirstream2);
        if (fd < 0) {
-               close(fddst);
-               fprintf(stderr, "ERROR: can't access to '%s'\n", dstdir);
-               return 12;
+               fprintf(stderr, "ERROR: can't access '%s'\n", dstdir);
+               goto out;
        }
 
        if (readonly) {
@@ -531,22 +713,26 @@ static int cmd_snapshot(int argc, char **argv)
                args.size = qgroup_inherit_size(inherit);
                args.qgroup_inherit = inherit;
        }
-       strncpy(args.name, newname, BTRFS_SUBVOL_NAME_MAX);
-       args.name[BTRFS_SUBVOL_NAME_MAX-1] = 0;
-       res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
-       e = errno;
+       strncpy_null(args.name, newname);
 
-       close(fd);
-       close(fddst);
+       res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
 
-       if(res < 0 ){
+       if (res < 0) {
                fprintf( stderr, "ERROR: cannot snapshot '%s' - %s\n",
-                       subvol, strerror(e));
-               return 11;
+                       subvol, strerror(errno));
+               goto out;
        }
+
+       retval = 0;     /* success */
+
+out:
+       close_file_or_dir(fddst, dirstream1);
+       close_file_or_dir(fd, dirstream2);
        free(inherit);
+       free(dupname);
+       free(dupdir);
 
-       return 0;
+       return retval;
 }
 
 static const char * const cmd_subvol_get_default_usage[] = {
@@ -557,59 +743,61 @@ static const char * const cmd_subvol_get_default_usage[] = {
 
 static int cmd_subvol_get_default(int argc, char **argv)
 {
-       int fd;
+       int fd = -1;
        int ret;
        char *subvol;
        struct btrfs_list_filter_set *filter_set;
        u64 default_id;
+       DIR *dirstream = NULL;
 
        if (check_argc_exact(argc, 2))
                usage(cmd_subvol_get_default_usage);
 
        subvol = argv[1];
-
-       ret = test_issubvolume(subvol);
-       if (ret < 0) {
-               fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               return 12;
-       }
-       if (!ret) {
-               fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
-               return 13;
-       }
-
-       fd = open_file_or_dir(subvol);
+       fd = open_file_or_dir(subvol, &dirstream);
        if (fd < 0) {
                fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
-               return 12;
+               return 1;
        }
 
        ret = btrfs_list_get_default_subvolume(fd, &default_id);
        if (ret) {
                fprintf(stderr, "ERROR: can't perform the search - %s\n",
                        strerror(errno));
-               return ret;
+               goto out;
        }
 
+       ret = 1;
        if (default_id == 0) {
                fprintf(stderr, "ERROR: 'default' dir item not found\n");
-               return ret;
+               goto out;
        }
 
        /* no need to resolve roots if FS_TREE is default */
        if (default_id == BTRFS_FS_TREE_OBJECTID) {
                printf("ID 5 (FS_TREE)\n");
-               return ret;
+               ret = 0;
+               goto out;
        }
 
        filter_set = btrfs_list_alloc_filter_set();
        btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_ROOTID,
                                default_id);
 
-       ret = btrfs_list_subvols(fd, filter_set, NULL, 0);
-       if (ret)
-               return 19;
-       return 0;
+       /* by default we shall print the following columns*/
+       btrfs_list_setup_print_column(BTRFS_LIST_OBJECTID);
+       btrfs_list_setup_print_column(BTRFS_LIST_GENERATION);
+       btrfs_list_setup_print_column(BTRFS_LIST_TOP_LEVEL);
+       btrfs_list_setup_print_column(BTRFS_LIST_PATH);
+
+       ret = btrfs_list_subvols_print(fd, filter_set, NULL,
+               BTRFS_LIST_LAYOUT_DEFAULT, 1, NULL);
+
+       if (filter_set)
+               btrfs_list_free_filter_set(filter_set);
+out:
+       close_file_or_dir(fd, dirstream);
+       return !!ret;
 }
 
 static const char * const cmd_subvol_set_default_usage[] = {
@@ -624,6 +812,7 @@ static int cmd_subvol_set_default(int argc, char **argv)
        u64     objectid;
        char    *path;
        char    *subvolid;
+       DIR     *dirstream = NULL;
 
        if (check_argc_exact(argc, 3))
                usage(cmd_subvol_set_default_usage);
@@ -631,24 +820,21 @@ static int cmd_subvol_set_default(int argc, char **argv)
        subvolid = argv[1];
        path = argv[2];
 
-       fd = open_file_or_dir(path);
+       objectid = arg_strtou64(subvolid);
+
+       fd = open_file_or_dir(path, &dirstream);
        if (fd < 0) {
-               fprintf(stderr, "ERROR: can't access to '%s'\n", path);
-               return 12;
+               fprintf(stderr, "ERROR: can't access '%s'\n", path);
+               return 1;
        }
 
-       objectid = (unsigned long long)strtoll(subvolid, NULL, 0);
-       if (errno == ERANGE) {
-               fprintf(stderr, "ERROR: invalid tree id (%s)\n",subvolid);
-               return 30;
-       }
        ret = ioctl(fd, BTRFS_IOC_DEFAULT_SUBVOL, &objectid);
        e = errno;
-       close(fd);
-       if( ret < 0 ){
+       close_file_or_dir(fd, dirstream);
+       if (ret < 0) {
                fprintf(stderr, "ERROR: unable to set a new default subvolume - %s\n",
                        strerror(e));
-               return 30;
+               return 1;
        }
        return 0;
 }
@@ -665,32 +851,188 @@ static int cmd_find_new(int argc, char **argv)
        int ret;
        char *subvol;
        u64 last_gen;
+       DIR *dirstream = NULL;
 
        if (check_argc_exact(argc, 3))
                usage(cmd_find_new_usage);
 
        subvol = argv[1];
-       last_gen = atoll(argv[2]);
+       last_gen = arg_strtou64(argv[2]);
 
        ret = test_issubvolume(subvol);
        if (ret < 0) {
                fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
-               return 12;
+               return 1;
        }
        if (!ret) {
                fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
-               return 13;
+               return 1;
        }
 
-       fd = open_file_or_dir(subvol);
+       fd = open_file_or_dir(subvol, &dirstream);
        if (fd < 0) {
                fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
-               return 12;
+               return 1;
        }
+
+       ret = ioctl(fd, BTRFS_IOC_SYNC);
+       if (ret < 0) {
+               fprintf(stderr, "ERROR: unable to fs-syncing '%s' - %s\n",
+                       subvol, strerror(errno));
+               close_file_or_dir(fd, dirstream);
+               return 1;
+       }
+
        ret = btrfs_list_find_updated_files(fd, 0, last_gen);
-       if (ret)
-               return 19;
-       return 0;
+       close_file_or_dir(fd, dirstream);
+       return !!ret;
+}
+
+static const char * const cmd_subvol_show_usage[] = {
+       "btrfs subvolume show <subvol-path>",
+       "Show more information of the subvolume",
+       NULL
+};
+
+static int cmd_subvol_show(int argc, char **argv)
+{
+       struct root_info get_ri;
+       struct btrfs_list_filter_set *filter_set;
+       char tstr[256];
+       char uuidparse[BTRFS_UUID_UNPARSED_SIZE];
+       char *fullpath = NULL, *svpath = NULL, *mnt = NULL;
+       char raw_prefix[] = "\t\t\t\t";
+       u64 sv_id, mntid;
+       int fd = -1, mntfd = -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;
+       }
+
+       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);
+               goto out;
+       }
+
+       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;
+       }
+       ret = 1;
+       svpath = get_subvol_name(mnt, fullpath);
+
+       fd = open_file_or_dir(fullpath, &dirstream1);
+       if (fd < 0) {
+               fprintf(stderr, "ERROR: can't access '%s'\n", fullpath);
+               goto out;
+       }
+
+       ret = btrfs_list_get_path_rootid(fd, &sv_id);
+       if (ret) {
+               fprintf(stderr, "ERROR: can't get rootid for '%s'\n",
+                       fullpath);
+               goto out;
+       }
+
+       mntfd = open_file_or_dir(mnt, &dirstream2);
+       if (mntfd < 0) {
+               fprintf(stderr, "ERROR: can't access '%s'\n", mnt);
+               goto out;
+       }
+
+       ret = btrfs_list_get_path_rootid(mntfd, &mntid);
+       if (ret) {
+               fprintf(stderr, "ERROR: can't get rootid for '%s'\n", mnt);
+               goto out;
+       }
+
+       if (sv_id == BTRFS_FS_TREE_OBJECTID) {
+               printf("%s is btrfs root\n", fullpath);
+               goto out;
+       }
+
+       memset(&get_ri, 0, sizeof(get_ri));
+       get_ri.root_id = sv_id;
+
+       if (btrfs_get_subvol(mntfd, &get_ri)) {
+               fprintf(stderr, "ERROR: can't find '%s'\n",
+                       svpath);
+               goto out;
+       }
+
+       ret = 0;
+       /* print the info */
+       printf("%s\n", fullpath);
+       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);
+
+       if (uuid_is_null(get_ri.puuid))
+               strcpy(uuidparse, "-");
+       else
+               uuid_unparse(get_ri.puuid, uuidparse);
+       printf("\tParent uuid: \t\t%s\n", uuidparse);
+
+       if (get_ri.otime) {
+               struct tm tm;
+
+               localtime_r(&get_ri.otime, &tm);
+               strftime(tstr, 256, "%Y-%m-%d %X", &tm);
+       } 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("\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);
+
+       if (get_ri.flags & BTRFS_ROOT_SUBVOL_RDONLY)
+               printf("\tFlags: \t\t\treadonly\n");
+       else
+               printf("\tFlags: \t\t\t-\n");
+
+       /* print the snapshots of the given subvol if any*/
+       printf("\tSnapshot(s):\n");
+       filter_set = btrfs_list_alloc_filter_set();
+       btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_BY_PARENT,
+                               (u64)(unsigned long)get_ri.uuid);
+       btrfs_list_setup_print_column(BTRFS_LIST_PATH);
+       btrfs_list_subvols_print(fd, filter_set, NULL, BTRFS_LIST_LAYOUT_RAW,
+                       1, raw_prefix);
+
+       /* clean up */
+       free(get_ri.path);
+       free(get_ri.name);
+       free(get_ri.full_path);
+       btrfs_list_free_filter_set(filter_set);
+
+out:
+       close_file_or_dir(fd, dirstream1);
+       close_file_or_dir(mntfd, dirstream2);
+       free(mnt);
+       free(fullpath);
+       return !!ret;
 }
 
 const struct cmd_group subvolume_cmd_group = {
@@ -704,7 +1046,8 @@ const struct cmd_group subvolume_cmd_group = {
                { "set-default", cmd_subvol_set_default,
                        cmd_subvol_set_default_usage, NULL, 0 },
                { "find-new", cmd_find_new, cmd_find_new_usage, NULL, 0 },
-               { 0, 0, 0, 0, 0 }
+               { "show", cmd_subvol_show, cmd_subvol_show_usage, NULL, 0 },
+               NULL_CMD_STRUCT
        }
 };