610e9bfd8c
upstream release, update local patches tha are going to be merged in the next release (fingers crossed) OBS-URL: https://build.opensuse.org/request/show/251480 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=172
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From 28c2061817b8cb266458249cc7bdd770eb2b407b Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Thu, 16 Jan 2014 14:18:37 +0100
|
|
Subject: [PATCH 29/42] 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 <dsterba@suse.cz>
|
|
---
|
|
ctree.h | 6 ++++++
|
|
utils.c | 7 ++++++-
|
|
2 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/utils.c b/utils.c
|
|
index f2ab416c28b2..ca150404ea6f 100644
|
|
--- a/utils.c
|
|
+++ b/utils.c
|
|
@@ -2473,7 +2473,10 @@ u64 get_partition_size(char *dev)
|
|
*/
|
|
const 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:
|
|
@@ -2482,6 +2485,8 @@ const 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";
|
|
}
|
|
--
|
|
1.9.0
|
|
|