From patchwork Sun Sep 30 14:18:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dieter Ries X-Patchwork-Id: 1528981 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 7B2F93FC71 for ; Sun, 30 Sep 2012 14:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751481Ab2I3OZL (ORCPT ); Sun, 30 Sep 2012 10:25:11 -0400 Received: from psi.thgersdorf.net ([176.9.98.78]:44042 "EHLO mail.psioc.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751479Ab2I3OYr (ORCPT ); Sun, 30 Sep 2012 10:24:47 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost.psioc.net (Postfix) with ESMTP id B35324D6517; Sun, 30 Sep 2012 16:18:40 +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 oIJ5DH5bP6RK; Sun, 30 Sep 2012 16:18:39 +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 4BF9F4D6507; Sun, 30 Sep 2012 16:18:39 +0200 (CEST) From: Dieter Ries To: linux-btrfs@vger.kernel.org Cc: Dieter Ries Subject: [PATCH 3/3] btrfs-progs: btrfsck: Print feedback about fscking to stdout. Date: Sun, 30 Sep 2012 16:18:30 +0200 Message-Id: <1349014710-16089-4-git-send-email-mail@dieterries.net> X-Mailer: git-send-email 1.7.3.GIT In-Reply-To: <1349014710-16089-1-git-send-email-mail@dieterries.net> References: <1349014710-16089-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 | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index dde63e7..245ba7d 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -3557,7 +3557,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); @@ -3565,22 +3565,31 @@ 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) {