common: fix function _require_batched_discard()
authorFilipe Manana <fdmanana@suse.com>
Wed, 21 Jan 2015 04:57:03 +0000 (15:57 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 21 Jan 2015 04:57:03 +0000 (15:57 +1100)
Commit 01d42b7efe3fcb9169befda3072c41d25a87c920 broke the check
for the success status of running fstrim. The [ ] bracets should
have been killed. This made several tests being skipped even when
the test/scratch devices support trim/discard.

For reference:

$ [ fstrim /mnt/ ] || echo foobar
bash: [: fstrim: unary operator expected
foobar

$ fstrim /mnt/ || echo foobar
$ echo $?
0

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
common/rc

index 5ce33229f2301255d620d828b8c7ef650c1a14fd..5770b0a3b9bdf3ec764a3fc0c0aa6f78314d914f 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -2388,7 +2388,7 @@ _require_batched_discard()
                exit 1
        fi
        _require_fstrim
-       [$FSTRIM_PROG $1 > /dev/null 2>&1] || _notrun "FITRIM not supported on $1"
+       $FSTRIM_PROG $1 > /dev/null 2>&1 || _notrun "FITRIM not supported on $1"
 }
 
 _require_dumpe2fs()