6beb01c50d
- update to upstream 3.14.1 - mkfs: - fix TRIM detection - do not zero-out end of device unconditionally - no crash with --features option - fsck: - clear log tree in repair mode - check reloc roots - btrfs - reworked space reporting (bnc#873106) - btrfs fi usage - new command - btrfs dev usage - new command - btrfs fi df - enhanced output with GlobalReserve - Removed patches: * 0001-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch - Added patches: * 0001-Btrfs-progs-fix-check-to-test-trim-support.patch * 0002-Btrfs-progs-fsck-fix-double-free-memory-crash.patch * 0003-Btrfs-progs-mkfs-Remove-zero_end-1-since-it-has-been.patch * 0004-btrfs-progs-fix-wrong-max-system-array-size-check-in.patch * 0005-btrfs-progs-move-arg_strtou64-to-a-separate-file-for.patch * 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch * 0007-Btrfs-progs-fsck-avoid-pinning-same-block-several-ti.patch * 0008-Btrfs-progs-fsck-add-ability-to-check-reloc-roots.patch * 0009-btrfs-progs-prevent-close_root-if-the-root-to-close-.patch * 0010-btrfs-progs-fix-mkfs.btrfs-segfault-with-features-op.patch * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch * 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch * 0014-btrfs-progs-Add-btrfs-device-disk-usage-command.patch * 0015-btrfs-progs-cleanup-dead-return-after-usage-for-fi-d.patch * 0016-btrfs-progs-Fix-memleak-in-get_raid56_used.patch * 0017-Btrfs-progs-fi-usage-free-memory-if-realloc-fails.patch * 0018-btrfs-progs-read-global-reserve-size-from-space-info.patch * 0019-btrfs-progs-add-original-df-and-rename-disk_usage-to.patch * 0020-btrfs-progs-move-device-usage-to-cmds-device-more-cl.patch * 0021-btrfs-progs-check-if-we-can-t-get-info-from-ioctls-d.patch * 0022-btrfs-progs-zero-out-structures-before-calling-ioctl.patch * 0023-btrfs-progs-print-B-for-bytes.patch * 0024-btrfs-progs-Print-more-info-about-device-sizes.patch * 0025-btrfs-progs-compare-unallocated-space-against-the-co.patch * 0026-btrfs-progs-add-section-of-overall-filesystem-usage.patch * 0027-btrfs-progs-cleanup-filesystem-device-usage-code.patch * 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch * 0029-btrfs-progs-replace-df_pretty_sizes-with-pretty_size.patch * 0030-btrfs-progs-clean-up-return-codes-and-paths.patch * 0031-btrfs-progs-move-global-reserve-to-overall-summary.patch OBS-URL: https://build.opensuse.org/request/show/232435 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=156
97 lines
3.0 KiB
Diff
97 lines
3.0 KiB
Diff
From 552e2741a3b0ce344c73b3e1d80d385605d49e75 Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Tue, 29 Apr 2014 17:32:22 +0200
|
|
Subject: [PATCH 42/42] btrfs-progs: move global reserve to overall summary
|
|
|
|
It looks confusing among the chunks, it is not in fact a chunk type.
|
|
|
|
Sample:
|
|
Overall:
|
|
Device size: 35.00GiB
|
|
Device allocated: 8.07GiB
|
|
Device unallocated: 26.93GiB
|
|
Used: 1.12MiB
|
|
Free (Estimated): 17.57GiB (Max: 30.98GiB, min: 17.52GiB)
|
|
Data to device ratio: 50 %
|
|
Global reserve: 16.00MiB (used: 0.00B)
|
|
...
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
cmds-fi-disk_usage.c | 22 ++++++++++++++++++++--
|
|
1 file changed, 20 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
|
|
index 7c93247e4f54..0caba159b974 100644
|
|
--- a/cmds-fi-disk_usage.c
|
|
+++ b/cmds-fi-disk_usage.c
|
|
@@ -319,6 +319,8 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
|
|
u64 total_free; /* logical space un-used */
|
|
double K;
|
|
u64 raid5_used, raid6_used;
|
|
+ u64 global_reserve;
|
|
+ u64 global_reserve_used;
|
|
|
|
sargs = load_space_info(fd, path);
|
|
if (!sargs) {
|
|
@@ -341,6 +343,8 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
|
|
total_chunks = 0;
|
|
total_used = 0;
|
|
total_free = 0;
|
|
+ global_reserve = 0;
|
|
+ global_reserve_used = 0;
|
|
|
|
for (i = 0; i < sargs->total_spaces; i++) {
|
|
float ratio = 1;
|
|
@@ -366,6 +370,11 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
|
|
else
|
|
ratio = 1;
|
|
|
|
+ if (flags & BTRFS_SPACE_INFO_GLOBAL_RSV) {
|
|
+ global_reserve = sargs->spaces[i].total_bytes;
|
|
+ global_reserve_used = sargs->spaces[i].used_bytes;
|
|
+ }
|
|
+
|
|
allocated = sargs->spaces[i].total_bytes * ratio;
|
|
|
|
total_chunks += allocated;
|
|
@@ -404,6 +413,9 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
|
|
pretty_size_mode((total_disk-total_chunks) / 2 + total_free, mode));
|
|
printf(" Data to device ratio:\t%*.0f %%\n",
|
|
width - 2, K * 100);
|
|
+ printf(" Global reserve:\t\t%*s\t(used: %s)\n", width,
|
|
+ pretty_size_mode(global_reserve, mode),
|
|
+ pretty_size_mode(global_reserve_used, mode));
|
|
|
|
exit:
|
|
|
|
@@ -553,8 +565,11 @@ static void _cmd_filesystem_usage_tabular(int mode,
|
|
/* header */
|
|
for (i = 0; i < sargs->total_spaces; i++) {
|
|
const char *description;
|
|
-
|
|
u64 flags = sargs->spaces[i].flags;
|
|
+
|
|
+ if (flags & BTRFS_SPACE_INFO_GLOBAL_RSV)
|
|
+ continue;
|
|
+
|
|
description = group_type_str(flags);
|
|
|
|
table_printf(matrix, 1+i, 0, "<%s", description);
|
|
@@ -715,8 +730,11 @@ static void _cmd_filesystem_usage_linear(int mode,
|
|
for (i = 0; i < sargs->total_spaces; i++) {
|
|
const char *description;
|
|
const char *r_mode;
|
|
-
|
|
u64 flags = sargs->spaces[i].flags;
|
|
+
|
|
+ if (flags & BTRFS_SPACE_INFO_GLOBAL_RSV)
|
|
+ continue;
|
|
+
|
|
description= group_type_str(flags);
|
|
r_mode = group_profile_str(flags);
|
|
|
|
--
|
|
1.9.0
|
|
|