61 lines
1.8 KiB
Diff
61 lines
1.8 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/ctree.h b/ctree.h
|
||
|
|
index 8ac17619b9dc..5c43fc5f5f6e 100644
|
||
|
|
--- a/ctree.h
|
||
|
|
+++ b/ctree.h
|
||
|
|
@@ -862,6 +862,12 @@ struct btrfs_csum_item {
|
||
|
|
/* used in struct btrfs_balance_args fields */
|
||
|
|
#define BTRFS_AVAIL_ALLOC_BIT_SINGLE (1ULL << 48)
|
||
|
|
|
||
|
|
+/*
|
||
|
|
+ * GLOBAL_RSV does not exist as a on-disk block group type and is used
|
||
|
|
+ * internally for exporting info about global block reserve from space infos
|
||
|
|
+ */
|
||
|
|
+#define BTRFS_SPACE_INFO_GLOBAL_RSV (1ULL << 49)
|
||
|
|
+
|
||
|
|
#define BTRFS_QGROUP_STATUS_OFF 0
|
||
|
|
#define BTRFS_QGROUP_STATUS_ON 1
|
||
|
|
#define BTRFS_QGROUP_STATUS_SCANNING 2
|
||
|
|
diff --git a/utils.c b/utils.c
|
||
|
|
index f2ab416c28b2..ca150404ea6f 100644
|
||
|
|
--- a/utils.c
|
||
|
|
+++ b/utils.c
|
||
|
|
@@ -2240,7 +2240,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:
|
||
|
|
@@ -2249,6 +2252,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
|
||
|
|
|