RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-06 21:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: subvolume show: print all items unconditionally in json

Browse Source 
The json output could be easily filtered on the user side so we'll print
everything unconditionally.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-08-17 22:30:15 +02:00
parent 42d0861e31
commit 29060ec176
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmds/subvolume.c
View File

@ -1387,13 +1387,9 @@ static void print_subvolume_show_json(struct format_ctx *fctx,
{ {
fmt_print(fctx, "name", subvol_name); fmt_print(fctx, "name", subvol_name);
if (!uuid_is_null(subvol->uuid)) fmt_print(fctx, "uuid", subvol->uuid);
fmt_print(fctx, "uuid", subvol->uuid); fmt_print(fctx, "parent_uuid", subvol->parent_uuid);
if (!uuid_is_null(subvol->parent_uuid)) fmt_print(fctx, "received_uuid", subvol->received_uuid);
fmt_print(fctx, "parent_uuid", subvol->parent_uuid);
if (!uuid_is_null(subvol->received_uuid))
fmt_print(fctx, "received_uuid", subvol->received_uuid);
fmt_print(fctx, "otime", subvol->otime); fmt_print(fctx, "otime", subvol->otime);
fmt_print(fctx, "ID", subvol->id); fmt_print(fctx, "ID", subvol->id);
fmt_print(fctx, "gen", subvol->generation); fmt_print(fctx, "gen", subvol->generation);
@ -1406,17 +1402,10 @@ static void print_subvolume_show_json(struct format_ctx *fctx,
fmt_print(fctx, "flag-list-item", "readonly"); fmt_print(fctx, "flag-list-item", "readonly");
fmt_print_end_group(fctx, "flags"); fmt_print_end_group(fctx, "flags");
if (subvol->stransid) fmt_print(fctx, "stransid", subvol->stransid);
fmt_print(fctx, "stransid", subvol->stransid); fmt_print(fctx, "stime", subvol->stime);
fmt_print(fctx, "rtransid", subvol->rtransid);
if (subvol->stime.tv_sec) fmt_print(fctx, "rtime", subvol->rtime);
fmt_print(fctx, "stime", subvol->stime);
if (subvol->rtransid)
fmt_print(fctx, "rtransid", subvol->rtransid);
if (subvol->rtime.tv_sec)
fmt_print(fctx, "rtime", subvol->rtime);
} }
static void print_subvolume_show_quota_json(struct format_ctx *fctx, static void print_subvolume_show_quota_json(struct format_ctx *fctx,