From da5db5596ca3dcdbc6edf3e79534c36610bf6fbb Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 29 Apr 2014 17:57:01 +0200 Subject: btrfs-progs: read global reserve size from space infos Kernels >= 3.15 export the global block reserve as a space info presented by 'btrfs fi df' but would display 'unknown' instead of some meaningful string. Signed-off-by: David Sterba --- cmds-filesystem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmds-filesystem.c') diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 7e8ca950..0301442f 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -120,7 +120,10 @@ static const char * const cmd_df_usage[] = { static char *group_type_str(u64 flag) { - switch (flag & BTRFS_BLOCK_GROUP_TYPE_MASK) { + u64 mask = BTRFS_BLOCK_GROUP_TYPE_MASK | + BTRFS_SPACE_INFO_GLOBAL_RSV; + + switch (flag & mask) { case BTRFS_BLOCK_GROUP_DATA: return "Data"; case BTRFS_BLOCK_GROUP_SYSTEM: @@ -129,6 +132,8 @@ static char *group_type_str(u64 flag) return "Metadata"; case BTRFS_BLOCK_GROUP_DATA|BTRFS_BLOCK_GROUP_METADATA: return "Data+Metadata"; + case BTRFS_SPACE_INFO_GLOBAL_RSV: + return "GlobalReserve"; default: return "unknown"; } -- cgit v1.2.3