btrfs-progs: adjust the return values for scrub

o Return 0 to indicate success,
  when detected errors were corrected during scrubbing.
  P.s. This is also to facilitate scripting when return value
       is to be checked.
o Warn the users if there are uncorrectable errors detected.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/cmds-scrub.c b/cmds-scrub.c
index 5265a2b..f9e2b40 100644 (file)
--- a/cmds-scrub.c
+++ b/cmds-scrub.c
@@ -1514,14 +1514,17 @@ out:
        }
        close_file_or_dir(fdmnt, dirstream);
 
-       if (nothing_to_resume)
-               return 2;
        if (err)
                return 1;
-       if (e_correctable)
+       if (nothing_to_resume)
+               return 2;
+       if (e_uncorrectable) {
+               ERR(!do_quiet, "ERROR: There are uncorrectable errors.\n");
                return 3;
-       if (e_uncorrectable)
-               return 4;
+       }
+       if (e_correctable)
+               ERR(!do_quiet, "WARNING: errors detected during scrubbing, corrected.\n");
+
        return 0;
 }