From patchwork Wed Sep 4 15:22:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2853744 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CB8D99F485 for ; Wed, 4 Sep 2013 15:23:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93A4A204D3 for ; Wed, 4 Sep 2013 15:22:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61DB9204CE for ; Wed, 4 Sep 2013 15:22:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762858Ab3IDPWx (ORCPT ); Wed, 4 Sep 2013 11:22:53 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:44209 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756525Ab3IDPWw (ORCPT ); Wed, 4 Sep 2013 11:22:52 -0400 Received: by mail-pa0-f45.google.com with SMTP id bg4so571295pad.18 for ; Wed, 04 Sep 2013 08:22:51 -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=h+Ie8kmYRJ454BJFHlhtRyV6dGgVgZvp7fRNCtfD7W4=; b=i4Ruk8B+ID0VgxQM8bD46ylgdDos+oxDWjsjtL2T1wdv+ikMnNlfeIjLITPpL38r71 2I0GddvQZPd1ZJgt9VXMrqlvSXqTdKx0z2hXvW51+zC/AmrcSwwMdRIgk8EXbUft35wi hN/Aa5cddqHF9nv9VcN381tbotskAbwFXpX125Ib0ZwvGcVCseTMVQ32yPjFyE8ybBD8 YFXoRXOuXE/099PJPOuEV3hdIwinkqb4h/y/abmX0PNIvusyCorrgKTdoIv1CiINKG4p aMI07bc3lteSk7nMOEx/9diCw3opKnV+RTavzUAL3m4XS7GKoNVjPxw3GGpkMMARNMFs /OxA== X-Received: by 10.68.41.137 with SMTP id f9mr3394334pbl.148.1378308171598; Wed, 04 Sep 2013 08:22:51 -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:22:50 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, sandeen@redhat.com Subject: [PATCH 03/20] Btrfs-progs: fix magic return value in cmds-chunk.c Date: Wed, 4 Sep 2013 23:22:20 +0800 Message-Id: <1378308157-4621-4-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 --- cmds-chunk.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmds-chunk.c b/cmds-chunk.c index 54f0573..115db61 100644 --- a/cmds-chunk.c +++ b/cmds-chunk.c @@ -794,13 +794,15 @@ static int scan_devices(struct recover_control *rc) int ret = 0; int fd; struct btrfs_device *dev; + int e; list_for_each_entry(dev, &rc->fs_devices->devices, dev_list) { fd = open(dev->name, O_RDONLY); if (fd < 0) { + e = errno; fprintf(stderr, "Failed to open device %s\n", dev->name); - return -1; + return -e; } ret = scan_one_device(rc, fd, dev); close(fd); @@ -1785,7 +1787,7 @@ int cmd_chunk_recover(int argc, char *argv[]) ret = check_mounted(file); if (ret) { fprintf(stderr, "the device is busy\n"); - return ret; + goto out; } ret = btrfs_recover_chunk_tree(file, verbose, yes); @@ -1797,5 +1799,6 @@ int cmd_chunk_recover(int argc, char *argv[]) } else { fprintf(stdout, "Fail to recover the chunk tree.\n"); } - return ret; +out: + return !!ret; }