btrfs-progs: convert: show progress by default

Agreed by several people, showing progress by default makes sense as
conversion is a one-time and long running action.

Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/Documentation/btrfs-convert.txt b/Documentation/btrfs-convert.txt
index e508c34b4f6607b542c8090bf0e9ec02bfc964d7..170919706e71214ffe78f09e7a3247abd75ca558 100644 (file)
--- a/Documentation/btrfs-convert.txt
+++ b/Documentation/btrfs-convert.txt
@@ -30,7 +30,7 @@ set filesystem label during conversion.
 -L::
 use label from the converted filesystem.
 -p::
-Show progress of conversion.
+Show progress of conversion, on by default.
 
 EXIT STATUS
 -----------

diff --git a/btrfs-convert.c b/btrfs-convert.c
index da10ad668ea6d5965e8964fa21d6a75b46f22798..730fead4a86c646759b3374fc939b67825da979c 100644 (file)
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -2759,14 +2759,14 @@ fail:
 
 static void print_usage(void)
 {
-       printf("usage: btrfs-convert [-d] [-i] [-n] [-r] [-l label] [-L] device\n");
+       printf("usage: btrfs-convert [-d] [-i] [-n] [-r] [-l label] [-L] [-p] device\n");
        printf("\t-d           disable data checksum\n");
        printf("\t-i           ignore xattrs and ACLs\n");
        printf("\t-n           disable packing of small files\n");
        printf("\t-r           roll back to ext2fs\n");
        printf("\t-l LABEL     set filesystem label\n");
        printf("\t-L           use label from converted fs\n");
-       printf("\t-p           show converting progress\n");
+       printf("\t-p           show converting progress (default)\n");
 }
 
 int main(int argc, char *argv[])
@@ -2778,7 +2778,7 @@ int main(int argc, char *argv[])
        int rollback = 0;
        int copylabel = 0;
        int usage_error = 0;
-       int progress = 0;
+       int progress = 1;
        char *file;
        char *fslabel = NULL;