}
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);
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);
res = ioctl(fddst, BTRFS_IOC_SUBVOL_CREATE, &args);
}
- e = errno;
+ if (res < 0) {
+ fprintf(stderr, "ERROR: cannot create subvolume - %s\n",
+ strerror(errno));
+ goto out;
+ }
- close(fddst);
+ retval = 0; /* success */
+out:
+ close_file_or_dir(fddst, dirstream);
free(inherit);
+ free(dupname);
+ free(dupdir);
- if(res < 0 ){
- fprintf( stderr, "ERROR: cannot create subvolume - %s\n",
- strerror(e));
- return 11;
- }
-
- return 0;
+ return retval;
}
/*
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 <subvolume> [<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, cnt = 1, ret = 0;
+ 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}
+ };
+
+ optind = 1;
+ while (1) {
+ int c;
- if (argc < 2)
+ 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);
+ 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);
- ret = 12;
+ ret = 1;
goto out;
}
- if(!res){
+ if (!res) {
fprintf(stderr, "ERROR: '%s' is not a subvolume\n", path);
- ret = 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);
- ret = 14;
+ ret = 1;
goto out;
}
if (len == 0 || len >= BTRFS_VOL_NAME_MAX) {
fprintf(stderr, "ERROR: snapshot name too long ('%s)\n",
vname);
- ret = 14;
+ ret = 1;
goto out;
}
- fd = open_file_or_dir(dname);
+ fd = open_file_or_dir(dname, &dirstream);
if (fd < 0) {
- fprintf(stderr, "ERROR: can't access to '%s'\n", dname);
- ret = 12;
+ fprintf(stderr, "ERROR: can't access '%s'\n", dname);
+ ret = 1;
goto out;
}
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));
- ret = 11;
+ ret = 1;
goto out;
}
+ 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)
+ 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;
}
* - lowercase for enabling specific items in the output
*/
static const char * const cmd_subvol_list_usage[] = {
- "btrfs subvolume list [-agopurts] [-G [+|-]value] [-C [+|-]value] "
+ "btrfs subvolume list [options] [-G [+|-]value] [-C [+|-]value] "
"[--sort=gen,ogen,rootid,path] <path>",
"List subvolumes (and snapshots)",
"",
"-t print the result as a table",
"-s list snapshots only in the filesystem",
"-r list readonly subvolumes (including snapshots)",
+ "-d list deleted subvolumes that are not yet cleaned",
"-G [+|-]value",
" filter the subvolumes by generation",
" (+value: >= value; -value: <= value; value: = value)",
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();
optind = 1;
while(1) {
c = getopt_long(argc, argv,
- "acgopqsurG:C:t", long_options, NULL);
+ "acdgopqsurG:C:t", long_options, NULL);
if (c < 0)
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;
}
subvol = argv[optind];
-
- ret = test_issubvolume(subvol);
- if (ret < 0) {
- fprintf(stderr, "ERROR: error accessing '%s'\n", subvol);
- goto out;
- }
- if (!ret) {
- fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
- ret = -1;
- goto out;
- }
-
- fd = open_file_or_dir(subvol);
+ fd = open_file_or_dir(subvol, &dirstream);
if (fd < 0) {
ret = -1;
fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
!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;
+ 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));
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);
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) {
args.qgroup_inherit = inherit;
}
strncpy_null(args.name, newname);
- res = ioctl(fddst, BTRFS_IOC_SNAP_CREATE_V2, &args);
- e = errno;
- close(fd);
- close(fddst);
- free(inherit);
+ 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;
}
- return 0;
+ retval = 0; /* success */
+
+out:
+ close_file_or_dir(fddst, dirstream1);
+ close_file_or_dir(fd, dirstream2);
+ free(inherit);
+ free(dupname);
+ free(dupdir);
+
+ return retval;
}
static const char * const cmd_subvol_get_default_usage[] = {
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 1;
- }
- if (!ret) {
- fprintf(stderr, "ERROR: '%s' is not a subvolume\n", subvol);
- 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 1;
/* no need to resolve roots if FS_TREE is default */
if (default_id == BTRFS_FS_TREE_OBJECTID) {
printf("ID 5 (FS_TREE)\n");
+ ret = 0;
goto out;
}
if (filter_set)
btrfs_list_free_filter_set(filter_set);
out:
- if (fd != -1)
- close(fd);
- if (ret)
- return 1;
- return 0;
+ close_file_or_dir(fd, dirstream);
+ return !!ret;
}
static const char * const cmd_subvol_set_default_usage[] = {
u64 objectid;
char *path;
char *subvolid;
+ DIR *dirstream = NULL;
if (check_argc_exact(argc, 3))
usage(cmd_subvol_set_default_usage);
return 1;
}
- fd = open_file_or_dir(path);
+ fd = open_file_or_dir(path, &dirstream);
if (fd < 0) {
- fprintf(stderr, "ERROR: can't access to '%s'\n", path);
+ fprintf(stderr, "ERROR: can't access '%s'\n", path);
return 1;
}
ret = ioctl(fd, BTRFS_IOC_DEFAULT_SUBVOL, &objectid);
e = errno;
- close(fd);
+ close_file_or_dir(fd, dirstream);
if (ret < 0) {
fprintf(stderr, "ERROR: unable to set a new default subvolume - %s\n",
strerror(e));
int ret;
char *subvol;
u64 last_gen;
+ DIR *dirstream = NULL;
if (check_argc_exact(argc, 3))
usage(cmd_find_new_usage);
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);
- close(fd);
- if (ret)
- return 19;
- return 0;
+ close_file_or_dir(fd, dirstream);
+ return !!ret;
}
static const char * const cmd_subvol_show_usage[] = {
struct root_info get_ri;
struct btrfs_list_filter_set *filter_set;
char tstr[256];
- char uuidparse[37];
+ 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;
+ int ret = 1;
+ DIR *dirstream1 = NULL, *dirstream2 = NULL;
if (check_argc_exact(argc, 2))
usage(cmd_subvol_show_usage);
- fullpath = realpath(argv[1], 0);
+ fullpath = realpath(argv[1], NULL);
if (!fullpath) {
fprintf(stderr, "ERROR: finding real path for '%s', %s\n",
argv[1], strerror(errno));
}
if (!ret) {
fprintf(stderr, "ERROR: '%s' is not a subvolume\n", fullpath);
- ret = -1;
goto out;
}
"%s\n", fullpath, strerror(-ret));
goto out;
}
- ret = -1;
+ ret = 1;
svpath = get_subvol_name(mnt, fullpath);
- fd = open_file_or_dir(fullpath);
+ fd = open_file_or_dir(fullpath, &dirstream1);
if (fd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", fullpath);
goto out;
goto out;
}
- mntfd = open_file_or_dir(mnt);
+ mntfd = open_file_or_dir(mnt, &dirstream2);
if (mntfd < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", mnt);
goto out;
uuid_unparse(get_ri.puuid, uuidparse);
printf("\tParent uuid: \t\t%s\n", uuidparse);
- if (get_ri.otime)
- strftime(tstr, 256, "%Y-%m-%d %X",
- localtime(&get_ri.otime));
- else
+ 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("\tSnapshot(s):\n");
filter_set = btrfs_list_alloc_filter_set();
btrfs_list_setup_filter(&filter_set, BTRFS_LIST_FILTER_BY_PARENT,
- (u64)get_ri.uuid);
+ (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 */
- if (get_ri.path)
- free(get_ri.path);
- if (get_ri.name)
- free(get_ri.name);
- if (get_ri.full_path)
- free(get_ri.full_path);
- if (filter_set)
- btrfs_list_free_filter_set(filter_set);
+ free(get_ri.path);
+ free(get_ri.name);
+ free(get_ri.full_path);
+ btrfs_list_free_filter_set(filter_set);
out:
- if (mntfd >= 0)
- close(mntfd);
- if (fd >= 0)
- close(fd);
- if (mnt)
- free(mnt);
- if (fullpath)
- free(fullpath);
-
- return ret;
+ 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 = {
cmd_subvol_set_default_usage, NULL, 0 },
{ "find-new", cmd_find_new, cmd_find_new_usage, NULL, 0 },
{ "show", cmd_subvol_show, cmd_subvol_show_usage, NULL, 0 },
- { 0, 0, 0, 0, 0 }
+ NULL_CMD_STRUCT
}
};