From 965cd864491514e319c1f90cfece70437e535990 Mon Sep 17 00:00:00 2001 From: Gui Hecheng Date: Thu, 17 Jul 2014 10:40:36 +0800 Subject: 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 Signed-off-by: David Sterba --- cmds-scrub.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'cmds-scrub.c') diff --git a/cmds-scrub.c b/cmds-scrub.c index 5265a2b0..f9e2b40b 100644 --- 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; } -- cgit v1.2.3