fee391e33a
- 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 (forwarded request 232435 from dsterba) OBS-URL: https://build.opensuse.org/request/show/232437 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=40
97 lines
3.4 KiB
Diff
97 lines
3.4 KiB
Diff
From a2b5656ac87bd741153b97ac1e7bcf40ecc4f16c Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Thu, 24 Apr 2014 18:57:12 +0200
|
|
Subject: [PATCH 36/42] btrfs-progs: compare unallocated space against the
|
|
correct value
|
|
|
|
The device may not be fully occupied by the filesystem, the value of
|
|
Unallocated should not be calculated against the device size but the
|
|
size provided by DEV_INFO.
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
cmds-device.c | 6 ++----
|
|
cmds-fi-disk_usage.c | 9 ++++-----
|
|
cmds-fi-disk_usage.h | 2 +-
|
|
3 files changed, 7 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/cmds-device.c b/cmds-device.c
|
|
index 154188643c8f..3e851badc116 100644
|
|
--- a/cmds-device.c
|
|
+++ b/cmds-device.c
|
|
@@ -456,10 +456,8 @@ static int _cmd_device_usage(int fd, char *path, int mode)
|
|
printf("%s, ID: %llu\n", device_info_ptr[i].path,
|
|
device_info_ptr[i].devid);
|
|
print_device_sizes(fd, &device_info_ptr[i], mode);
|
|
- print_device_chunks(fd, device_info_ptr[i].devid,
|
|
- device_info_ptr[i].size,
|
|
- info_ptr, info_count,
|
|
- mode);
|
|
+ print_device_chunks(fd, &device_info_ptr[i],
|
|
+ info_ptr, info_count, mode);
|
|
printf("\n");
|
|
}
|
|
|
|
diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
|
|
index 63ed9ba089d5..0e93dc836f16 100644
|
|
--- a/cmds-fi-disk_usage.c
|
|
+++ b/cmds-fi-disk_usage.c
|
|
@@ -500,7 +500,7 @@ int load_device_info(int fd, struct device_info **device_info_ptr,
|
|
info[ndevs].devid = dev_info.devid;
|
|
strcpy(info[ndevs].path, (char *)dev_info.path);
|
|
info[ndevs].device_size = get_partition_size((char *)dev_info.path);
|
|
- info[ndevs].size = dev_info.total_size;
|
|
+ info[ndevs].size = dev_info.total_bytes;
|
|
++ndevs;
|
|
}
|
|
|
|
@@ -847,7 +847,7 @@ int cmd_filesystem_usage(int argc, char **argv)
|
|
return 0;
|
|
}
|
|
|
|
-void print_device_chunks(int fd, u64 devid, u64 total_size,
|
|
+void print_device_chunks(int fd, struct device_info *devinfo,
|
|
struct chunk_info *chunks_info_ptr,
|
|
int chunks_info_count, int mode)
|
|
{
|
|
@@ -860,7 +860,7 @@ void print_device_chunks(int fd, u64 devid, u64 total_size,
|
|
u64 flags;
|
|
u64 size;
|
|
|
|
- if (chunks_info_ptr[i].devid != devid)
|
|
+ if (chunks_info_ptr[i].devid != devinfo->devid)
|
|
continue;
|
|
|
|
flags = chunks_info_ptr[i].type;
|
|
@@ -879,7 +879,7 @@ void print_device_chunks(int fd, u64 devid, u64 total_size,
|
|
}
|
|
printf(" Unallocated: %*s%10s\n",
|
|
(int)(20 - strlen("Unallocated")), "",
|
|
- df_pretty_sizes(total_size - allocated, mode));
|
|
+ df_pretty_sizes(devinfo->size - allocated, mode));
|
|
}
|
|
|
|
void print_device_sizes(int fd, struct device_info *devinfo, int mode)
|
|
@@ -890,5 +890,4 @@ void print_device_sizes(int fd, struct device_info *devinfo, int mode)
|
|
printf(" FS occuppied:%*s%10s\n",
|
|
(int)(20 - strlen("FS occupied")), "",
|
|
df_pretty_sizes(devinfo->size, mode));
|
|
- }
|
|
}
|
|
diff --git a/cmds-fi-disk_usage.h b/cmds-fi-disk_usage.h
|
|
index 79cc2a115bc5..dbc2a10f31eb 100644
|
|
--- a/cmds-fi-disk_usage.h
|
|
+++ b/cmds-fi-disk_usage.h
|
|
@@ -50,7 +50,7 @@ int load_device_info(int fd, struct device_info **device_info_ptr,
|
|
int *device_info_count);
|
|
int load_chunk_info(int fd, struct chunk_info **info_ptr, int *info_count);
|
|
char *df_pretty_sizes(u64 size, int mode);
|
|
-void print_device_chunks(int fd, u64 devid, u64 total_size,
|
|
+void print_device_chunks(int fd, struct device_info *devinfo,
|
|
struct chunk_info *chunks_info_ptr,
|
|
int chunks_info_count, int mode);
|
|
void print_device_sizes(int fd, struct device_info *devinfo, int mode);
|
|
--
|
|
1.9.0
|
|
|