From patchwork Mon Oct 8 19:07:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dieter Ries X-Patchwork-Id: 1566731 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 65E7C40D54 for ; Mon, 8 Oct 2012 19:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754698Ab2JHTIP (ORCPT ); Mon, 8 Oct 2012 15:08:15 -0400 Received: from psi.thgersdorf.net ([176.9.98.78]:57777 "EHLO mail.psioc.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388Ab2JHTIM (ORCPT ); Mon, 8 Oct 2012 15:08:12 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost.psioc.net (Postfix) with ESMTP id EA9E14D641F; Mon, 8 Oct 2012 21:08:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at psioc.net Received: from mail.psioc.net ([127.0.0.1]) by localhost (mail.psioc.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id FT2nYB7qXtDE; Mon, 8 Oct 2012 21:08:08 +0200 (CEST) Received: from psioc.net (unknown [195.176.92.20]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.psioc.net (Postfix) with ESMTPSA id DF2944D650A; Mon, 8 Oct 2012 21:08:07 +0200 (CEST) From: Dieter Ries To: chris.mason@fusionio.com, linux-btrfs@vger.kernel.org Cc: Dieter Ries Subject: [PATCH 3/4] btrfs-progs: btrfsck: Print feedback about fscking to stdout. Date: Mon, 8 Oct 2012 21:07:49 +0200 Message-Id: <1349723270-12773-4-git-send-email-mail@dieterries.net> X-Mailer: git-send-email 1.7.3.GIT In-Reply-To: <1349723270-12773-1-git-send-email-mail@dieterries.net> References: <1349723270-12773-1-git-send-email-mail@dieterries.net> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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 516bcdf..83275cd 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -3559,7 +3559,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); @@ -3567,22 +3567,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) {