diff --git a/CHANGES b/CHANGES index 405dfa09..0f721b25 100644 --- a/CHANGES +++ b/CHANGES @@ -206,7 +206,7 @@ btrfs-progs-4.7 (2016-07-29) * more tests btrfs-progs-4.6.1 (2016-06-24) - * fi resize: negative resize argument accepted again + * filesystem resize: negative resize argument accepted again * qgroup rescan: fix skipping when rescan is in progress * mkfs: initialize stripesize to correct value * testsuite updates, mostly convert tests @@ -251,8 +251,8 @@ btrfs-progs-4.5.2 (2016-05-02) * check: catch when qgroup numbers mismatch * check: detect running quota rescan and report mismatches * balance start: add safety delay before doing a full balance - * fi sync: is now silent - * fi show: don't miss filesystems with partially matching uuids + * filesystem sync: is now silent + * filesystem show: don't miss filesystems with partially matching uuids * dev ready: accept only one argument for device * dev stats: print "devid:N" for a missing device instead of "(null)" * other: @@ -269,7 +269,7 @@ btrfs-progs-4.5 (2016-03-20) * btrfs-debug-tree -> btrfs inspect-internal dump-tree New commands: - * btrfs fi du - calculate disk usage, including shared extents + * btrfs filesystem du - calculate disk usage, including shared extents Enhancements: * device delete - delete by id (needs kernel support, not merged to @@ -362,7 +362,7 @@ btrfs-progs-4.3 (2015-11-06) * print version info earlier * print devices sorted by id * do not truncate target image with --rootsize - * fi usage: + * filesystem usage: * don't print global block reserve * print device id * minor output tuning @@ -408,11 +408,11 @@ btrfs-progs-4.2.3 (2015-10-19) * restore: off-by-one symlink path check fix btrfs-progs-4.2.2 (2015-10-05) - * fi label: use fallback if the label ioctl is not available + * filesystem label: use fallback if the label ioctl is not available * convert: check nodesize constraints against commandline features (-O) * scrub: report status 'running' until all devices are finished * device scanning might crash in some scenarios - * fi usage: print summary for non-root users + * filesystem usage: print summary for non-root users btrfs-progs-4.2.1 (2015-09-20) * fix an off-by-one error in cross-stripe boundary check @@ -571,7 +571,7 @@ btrfs-progs-3.19.1 (2015-03-25) * build fixes: * missing macro from public header, BTRFS_BUILD_VERSION * wrong handling of --enable-convert - * fi usage: reports correct space for degraded mounts + * filesystem usage: reports correct space for degraded mounts * other: * mkfs: help string updates * completion: added 'usage' subcommands @@ -595,7 +595,7 @@ btrfs-progs-3.18.2 (2015-01-27) * qgroup show: print human readable sizes, options to say otherwise * check: new option to explicitly say no to writes * mkfs: message about trimming is not printed to stderr - * fi show: fixed return value + * filesystem show: fixed return value * tests: new infrastructure * btrfstune: force flag can be used together with seeding option * backtrace support is back @@ -610,7 +610,7 @@ btrfs-progs-3.18 (2014-12-30) * mkfs - skinny-metadata feature is now on by default, first introduced in kernel 3.10 * filesystem usage - give an overview of fs usage in a way that's more - comprehensible than existing 'fi df' + comprehensible than existing 'filesystem df' * device usage - more detailed information about per-device allocations * check * option to set a different tree root byte number @@ -637,12 +637,12 @@ btrfs-progs-3.17.2 (2014-11-19) * zero-log: able to reset a fs with bogus log tree pointer (bug_72151) btrfs-progs-3.17.1 (2014-11-04) - * fi df: argument handling + * filesystem df: argument handling * fix linking with libbtrfs * replace: better error reporting - * fi show: fixed stall if run concurrently with balance + * filesystem show: fixed stall if run concurrently with balance * check: fixed argument parsing for --subvol-extents - * fi df: SI prefixes corrected + * filesystem df: SI prefixes corrected btrfs-progs-3.17 (2014-10-17) * check: --init-csum-tree actually does something useful, rebuilds the @@ -657,7 +657,7 @@ btrfs-progs-3.16.2 (2014-10-01) * a few fixes in fsck and image tools btrfs-progs-3.16.1 (2014-09-15) - * print GlobalReserve in fi df output + * print GlobalReserve in filesystem df output * new option -R in subvol list * library version defines * static build is fixed diff --git a/Documentation/btrfs-balance.asciidoc b/Documentation/btrfs-balance.asciidoc index 0b687eaf..fba55140 100644 --- a/Documentation/btrfs-balance.asciidoc +++ b/Documentation/btrfs-balance.asciidoc @@ -143,7 +143,7 @@ The minimum range boundary is inclusive, maximum is exclusive. *devid=*:: Balances only block groups which have at least one chunk on the given -device. To list devices with ids use *btrfs fi show*. +device. To list devices with ids use *btrfs filesystem show*. *drange=*:: Balance only block groups which overlap with the given byte range on any @@ -247,7 +247,7 @@ provided. Let's use the following real life example and start with the output: -------------------- -$ btrfs fi df /path +$ btrfs filesystem df /path Data, single: total=75.81GiB, used=64.44GiB System, RAID1: total=32.00MiB, used=20.00KiB Metadata, RAID1: total=15.87GiB, used=8.84GiB @@ -273,7 +273,7 @@ data and thus will be faster. A typical filter command would look like: # btrfs balance start -dusage=50 /path Done, had to relocate 2 out of 97 chunks -$ btrfs fi df /path +$ btrfs filesystem df /path Data, single: total=74.03GiB, used=64.43GiB System, RAID1: total=32.00MiB, used=20.00KiB Metadata, RAID1: total=15.87GiB, used=8.84GiB @@ -288,7 +288,7 @@ usage filter. # btrfs balance start -dusage=85 /path Done, had to relocate 13 out of 95 chunks -$ btrfs fi df /path +$ btrfs filesystem df /path Data, single: total=68.03GiB, used=64.43GiB System, RAID1: total=32.00MiB, used=20.00KiB Metadata, RAID1: total=15.87GiB, used=8.85GiB @@ -309,7 +309,7 @@ reflinks updated frequently. # btrfs balance start -musage=50 /path Done, had to relocate 4 out of 89 chunks -$ btrfs fi df /path +$ btrfs filesystem df /path Data, single: total=68.03GiB, used=64.43GiB System, RAID1: total=32.00MiB, used=20.00KiB Metadata, RAID1: total=14.87GiB, used=8.85GiB @@ -327,7 +327,7 @@ further compaction: # btrfs balance start -musage=70 /path Done, had to relocate 13 out of 88 chunks -$ btrfs fi df . +$ btrfs filesystem df . Data, single: total=68.03GiB, used=64.43GiB System, RAID1: total=32.00MiB, used=20.00KiB Metadata, RAID1: total=11.97GiB, used=8.83GiB @@ -351,7 +351,7 @@ can be used to reclaim unused block groups to make it available. # btrfs balance start -dusage=0 /path -------------------- -This should lead to decrease in the 'total' numbers in the *btrfs fi df* output. +This should lead to decrease in the 'total' numbers in the *btrfs filesystem df* output. EXIT STATUS ----------- diff --git a/Documentation/btrfs-filesystem.asciidoc b/Documentation/btrfs-filesystem.asciidoc index d57f28fb..f1dd3236 100644 --- a/Documentation/btrfs-filesystem.asciidoc +++ b/Documentation/btrfs-filesystem.asciidoc @@ -141,7 +141,7 @@ files, it will report a count of total bytes, and exclusive (not shared) bytes. We also calculate a 'set shared' value which is described below. + -Each argument to 'btrfs fi du' will have a 'set shared' value +Each argument to 'btrfs filesystem du' will have a 'set shared' value calculated for it. We define each 'set' as those files found by a recursive search of an argument. The 'set shared' value then is a sum of all shared space referenced by the set. @@ -262,7 +262,7 @@ root user (due to use of restricted ioctl). For both there's a summary section with information about space usage: + ------------------------- -$ btrfs fi usage /path +$ btrfs filesystem usage /path WARNING: cannot read detailed chunk info, RAID5/6 numbers will be incorrect, run as root Overall: Device size: 1.82TiB