small textual improvement to fstrim

small textual improvement to fstrim

[Benno Schulenberg]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]


Hi,

Hmm... "discard all mounted filesystems" does not sound like what
one would want fstrim to do.  :)  Better use the word "trim".  Attached
patch makes this change, and improves some other small issues beside.

Regards,

Benno

-- 
http://www.fastmail.fm - Same, same, but different...


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-textual-small-inprovements-to-usage-and-man-page-of-.patch --]
[-- Type: text/x-patch; name="0001-textual-small-inprovements-to-usage-and-man-page-of-.patch", Size: 2666 bytes --]

From c34848e79eff58fe944f8bb988653261bb824b1d Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 11 Dec 2013 12:40:14 +0100
Subject: [PATCH] textual: small inprovements to usage and man page of fstrim

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 sys-utils/fstrim.8 |    9 +++++----
 sys-utils/fstrim.c |    8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys-utils/fstrim.8 b/sys-utils/fstrim.8
index 6572c70..8f68351 100644
--- a/sys-utils/fstrim.8
+++ b/sys-utils/fstrim.8
@@ -37,9 +37,10 @@ GiB, TiB, PiB, EiB, ZiB and YiB (the "iB" is optional, e.g. "K" has the same
 meaning as "KiB") or the suffixes KB=1000, MB=1000*1000, and so on for GB, TB,
 PB, EB, ZB and YB.
 .IP "\fB\-a, \-\-all\fP"
-Discard all mounted filesystem on devices that support discard operation. The
-another options like offset, length and minimum are applied to all the devices.
-The errors from filesystems that do not support discard operation are silently
+Trim all mounted filesystems on devices that support the discard operation.
+The other supplied options, like \fB\-\-offset\fR, \fB\-\-length\fR and
+\fB-\-minimum\fR, are applied to all these devices.
+Errors from filesystems that do not support the discard operation are silently
 ignored.
 .IP "\fB\-h, \-\-help\fP"
 Display help text and exit.
@@ -87,7 +88,7 @@ failure
 .IP 32
 all failed
 .IP 64
-some filestems discard succeeded, some failed
+some filesystem discards have succeeded, some failed
 .PP
 The command
 .B fstrim --all
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 747e6bb..28d0ed7 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -215,10 +215,10 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	fprintf(out,
 	      _(" %s [options] <mount point>\n"), program_invocation_short_name);
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --all           discard all mounted supported filesystems\n"), out);
-	fputs(_(" -o, --offset <num>  offset in bytes to discard from\n"), out);
-	fputs(_(" -l, --length <num>  length of bytes to discard from the offset\n"), out);
-	fputs(_(" -m, --minimum <num> minimum extent length to discard\n"), out);
+	fputs(_(" -a, --all           trim all mounted filesystems that are supported\n"), out);
+	fputs(_(" -o, --offset <num>  the offset in bytes to start discarding from\n"), out);
+	fputs(_(" -l, --length <num>  the number of bytes to discard\n"), out);
+	fputs(_(" -m, --minimum <num> the minimum extent length to discard\n"), out);
 	fputs(_(" -v, --verbose       print number of discarded bytes\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
-- 
1.7.0.4

Re: small textual improvement to fstrim

[Karel Zak]

On Wed, Dec 11, 2013 at 12:46:13PM +0100, Benno Schulenberg wrote:
> Hmm... "discard all mounted filesystems" does not sound like what
> one would want fstrim to do.  :) 

 Good point ;-) Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com