]> www.infradead.org Git - mtd-utils.git/commitdiff
fs-tests: integck: print a bit less if in power cut mode
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Fri, 22 Apr 2011 17:05:51 +0000 (20:05 +0300)
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Sun, 24 Apr 2011 16:12:30 +0000 (19:12 +0300)
Do not print extra messages when unable to re-mount - they are
already printed by the recover function.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
tests/fs-tests/integrity/integck.c

index 55fe8beeb5be719a95b39859a01c72f8e141ba91..63f69563ddbf52ac9b2fed88b21adc40d1b1c695 100644 (file)
@@ -3014,6 +3014,18 @@ int main(int argc, char *argv[])
 
                free_test_data();
 
+               do {
+                       ret = recover_tested_fs();
+                       if (ret) {
+                               CHECK(errno == EROFS);
+                               rpt += 1;
+                       }
+                       /*
+                        * Mount may also fail due to an emulated power cut
+                        * while mounting - keep re-starting.
+                        */
+               } while (ret);
+
                /*
                 * The file-system became read-only and we are in power cut
                 * testing mode. Re-mount the file-system and re-start the
@@ -3022,19 +3034,6 @@ int main(int argc, char *argv[])
                if (args.verbose)
                        normsg("re-mount the FS and re-start - count %ld", rpt);
 
-               do {
-                       ret = recover_tested_fs();
-                       if (ret) {
-                               CHECK(errno == EROFS);
-                               /*
-                                * Mount may also fail due to an emulated power
-                                * cut while mounting - keep re-starting.
-                                */
-                               if (args.verbose)
-                                       normsg("could not mount, try again - count %ld",
-                                              ++rpt);
-                       }
-               } while (ret);
        }
 
        free_test_data();