Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow to print flags of subvolumes #941

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

allow to print flags of subvolumes #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/btrfs-subvolume.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ list [options] [-G [\+|-]<value>] [-C [+|-]<value>] [--sort=rootid,gen,ogen,path
(*parent* here means subvolume of which this subvolume is a snapshot).
-R
print the UUID of the sent subvolume, where the subvolume is the result of a receive operation.
-F
print the flags of the subvolume.

Type filtering:

Expand Down
25 changes: 24 additions & 1 deletion cmds/subvolume-list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ static const char * const cmd_subvolume_list_usage[] = {
OPTLINE("-u", "print the uuid of subvolumes (and snapshots)"),
OPTLINE("-q", "print the parent uuid of the snapshots"),
OPTLINE("-R", "print the uuid of the received snapshots"),
OPTLINE("-F", "print the flags of the subvolume"),
"",
"Type filtering:",
OPTLINE("-s", "list only snapshots"),
Expand Down Expand Up @@ -189,6 +190,7 @@ enum btrfs_list_column_enum {
BTRFS_LIST_PUUID,
BTRFS_LIST_RUUID,
BTRFS_LIST_UUID,
BTRFS_LIST_FLAGS,
BTRFS_LIST_PATH,
BTRFS_LIST_ALL,
};
Expand Down Expand Up @@ -280,6 +282,11 @@ static struct {
.column_name = "UUID",
.need_print = 0,
},
{
.name = "flags",
.column_name = "Flags",
.need_print = 0,
},
{
.name = "path",
.column_name = "Path",
Expand Down Expand Up @@ -1193,6 +1200,13 @@ static void print_subvolume_column(struct root_info *subv,
uuid_unparse(subv->ruuid, uuidparse);
pr_verbose(LOG_DEFAULT, "%-36s", uuidparse);
break;
case BTRFS_LIST_FLAGS:
if (subv->flags & BTRFS_ROOT_SUBVOL_RDONLY)
strcpy(tstr, "readonly");
else
strcpy(tstr, "-");
pr_verbose(LOG_DEFAULT, "%s", tstr);
break;
case BTRFS_LIST_PATH:
BUG_ON(!subv->full_path);
pr_verbose(LOG_DEFAULT, "%s", subv->full_path);
Expand Down Expand Up @@ -1321,6 +1335,12 @@ static void print_subvol_json_key(struct format_ctx *fctx,
case BTRFS_LIST_RUUID:
fmt_print(fctx, column_name, subv->ruuid);
break;
case BTRFS_LIST_FLAGS:
fmt_print_start_group(fctx, "flags", JSON_TYPE_ARRAY);
if (subv->flags & BTRFS_ROOT_SUBVOL_RDONLY)
fmt_print(fctx, "flag-list-item", "readonly");
fmt_print_end_group(fctx, "flags");
break;
case BTRFS_LIST_PATH:
BUG_ON(!subv->full_path);
fmt_print(fctx, column_name, subv->full_path);
Expand Down Expand Up @@ -1602,7 +1622,7 @@ static int cmd_subvolume_list(const struct cmd_struct *cmd, int argc, char **arg
};

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

Expand Down Expand Up @@ -1646,6 +1666,9 @@ static int cmd_subvolume_list(const struct cmd_struct *cmd, int argc, char **arg
case 'R':
btrfs_list_setup_print_column(BTRFS_LIST_RUUID);
break;
case 'F':
btrfs_list_setup_print_column(BTRFS_LIST_FLAGS);
break;
case 'r':
flags |= BTRFS_ROOT_SUBVOL_RDONLY;
break;
Expand Down