From patchwork Wed Sep 4 15:22:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2853757 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 01949C0AB5 for ; Wed, 4 Sep 2013 15:23:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62CF6204CF for ; Wed, 4 Sep 2013 15:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43F91201ED for ; Wed, 4 Sep 2013 15:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762960Ab3IDPXa (ORCPT ); Wed, 4 Sep 2013 11:23:30 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:62106 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762898Ab3IDPX3 (ORCPT ); Wed, 4 Sep 2013 11:23:29 -0400 Received: by mail-pd0-f179.google.com with SMTP id v10so464386pde.10 for ; Wed, 04 Sep 2013 08:23:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YoEgYMQpp2bYxBP0HbCE2niClDAZEirIlNB/KsJ3EeE=; b=d5KqOiMiuD+8ttrScEDw4lqFqhOp+cCwVg3lrYWOBlyVLIEaRSW3Ay2+flmUylyNH4 mGiXfjBD+GggVoLmPcO+Db63v0YKpO2QNm7QDEx2TGB3TkhlFph9WZNY4PH+QAk4bJdH uuqqXZmjJCu/ZQdg6dBwN2Gv7ep+7YNZtIKe6baC3/0r2xyGN01xD5rQaBzaDrk98yNf OdMF9OE+1yJXNllmS1Vr6YiujGYFzsryRCKehvE42AFBew/QqVap9eNan0IekAZwVcUi RYomxE+xeyouKyFLqnKKVcYPZ7hsqJPaCGe9VyNU99ytCd95MdXbEf5pnVDPfee0MK+m z7Zw== X-Received: by 10.68.194.104 with SMTP id hv8mr3797529pbc.168.1378308208894; Wed, 04 Sep 2013 08:23:28 -0700 (PDT) Received: from localhost.localdomain.localdomain ([223.65.191.73]) by mx.google.com with ESMTPSA id uw6sm29467271pbc.8.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Sep 2013 08:23:27 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, sandeen@redhat.com Subject: [PATCH 14/20] Btrfs-progs: fix magic return value in btrfs-zero-log.c Date: Wed, 4 Sep 2013 23:22:31 +0800 Message-Id: <1378308157-4621-15-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1378308157-4621-1-git-send-email-wangshilong1991@gmail.com> References: <1378308157-4621-1-git-send-email-wangshilong1991@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wang Shilong Signed-off-by: Wang Shilong --- btrfs-zero-log.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c index f249aec..31ec215 100644 --- a/btrfs-zero-log.c +++ b/btrfs-zero-log.c @@ -52,10 +52,11 @@ int main(int ac, char **av) if((ret = check_mounted(av[1])) < 0) { fprintf(stderr, "Could not check mount status: %s\n", strerror(-ret)); - return ret; + goto out; } else if(ret) { fprintf(stderr, "%s is currently mounted. Aborting.\n", av[1]); - return -EBUSY; + ret = -EBUSY; + goto out; } root = open_ctree(av[1], 0, 1); @@ -68,5 +69,6 @@ int main(int ac, char **av) btrfs_set_super_log_root_level(root->fs_info->super_copy, 0); btrfs_commit_transaction(trans, root); close_ctree(root); - return ret; +out: + return !!ret; }