From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psi.thgersdorf.net ([176.9.98.78]:48328 "EHLO mail.psioc.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754250Ab2JNPQU (ORCPT ); Sun, 14 Oct 2012 11:16:20 -0400 From: Dieter Ries To: linux-btrfs@vger.kernel.org, dave@jikos.cz Cc: chris.mason@fusionio.com, Dieter Ries Subject: [PATCH 3/4] btrfs-progs: btrfsck: Print feedback about fscking to stdout. Date: Sun, 14 Oct 2012 17:15:59 +0200 Message-Id: <1350227759-18764-1-git-send-email-mail@dieterries.net> In-Reply-To: <20121009150844.GT4405@twin.jikos.cz> References: <20121009150844.GT4405@twin.jikos.cz> Sender: linux-btrfs-owner@vger.kernel.org List-ID: Status reports of the checking process should be printed to stdout instead of stderr, as that is normal program output and not related to problems in btrfsck. This patch changes this behaviour and adds the output "Done!" after each of the parts. Signed-off-by: Dieter Ries --- btrfsck.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index ea654de..da8b4d7 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -3560,7 +3560,7 @@ int main(int ac, char **av) root = info->fs_root; - fprintf(stderr, "checking extents\n"); + printf("checking extents... "); if (rw) trans = btrfs_start_transaction(root, 1); @@ -3568,22 +3568,32 @@ int main(int ac, char **av) fprintf(stderr, "Reinit crc root\n"); ret = btrfs_fsck_reinit_root(trans, info->csum_root); if (ret) { + printf("\n"); fprintf(stderr, "crc root initialization failed\n"); return -EIO; } goto out; } ret = check_extents(trans, root, repair); - if (ret) + if (ret) { fprintf(stderr, "Errors found in extent allocation tree\n"); + printf("\n"); + } + else + printf("Done!\n"); - fprintf(stderr, "checking fs roots\n"); + printf("checking fs roots... "); ret = check_fs_roots(root, &root_cache); - if (ret) + if (ret) { + printf("\n"); goto out; + } + else + printf("Done!\n"); - fprintf(stderr, "checking root refs\n"); + printf("checking root refs... "); ret = check_root_refs(root, &root_cache); + printf("Done!\n"); out: free_root_recs(&root_cache); if (rw) { -- 1.7.3.GIT