From patchwork Wed Sep 4 15:22:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2853760 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 149CBC0AB5 for ; Wed, 4 Sep 2013 15:23:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58E33201ED for ; Wed, 4 Sep 2013 15:23:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F520204CE for ; Wed, 4 Sep 2013 15:23:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934893Ab3IDPXj (ORCPT ); Wed, 4 Sep 2013 11:23:39 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:47276 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934783Ab3IDPXg (ORCPT ); Wed, 4 Sep 2013 11:23:36 -0400 Received: by mail-pd0-f175.google.com with SMTP id q10so459311pdj.20 for ; Wed, 04 Sep 2013 08:23:36 -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=wr3cbLxCLoKXy6QjW8/JMU9p/S/AEAl3xOBFGuLaz0w=; b=Zwthy7CRp7EUuXWJdbtvb8leArmokKfFrS2iYogHwnMVgTsVSW0zqyPin6XdIZyNUN onCJZGvsGpARJYWYoONw/Iuvex8sUa9QdWxbmnS1f8YHk02a6nyTOlRHRGxq/y9L17QM ysU2NCSC/qsn80+iYAbfCsiLtODqVzR4eXkXi/VLHtKaH4GzVOSEFuawd00uqUP8PRa9 sLBoXoNfgI+PTatdhXoVskWbFuQ1Ldi2i//2le4ZgnlcB/YyO+NT17V6bQ2zNrIazzh+ syonrnnPWov/LO+9I22+x31qTTeC+iKvw80BOcs8gcCO1U+N1mf7BFE9Q9NSPAvLtWVB h5lg== X-Received: by 10.66.217.166 with SMTP id oz6mr3987123pac.22.1378308216614; Wed, 04 Sep 2013 08:23:36 -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:35 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, sandeen@redhat.com Subject: [PATCH 17/20] Btrfs-progs: fix magic return value in random-test.c Date: Wed, 4 Sep 2013 23:22:34 +0800 Message-Id: <1378308157-4621-18-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 --- random-test.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/random-test.c b/random-test.c index 2f44593..b7c6cdb 100644 --- a/random-test.c +++ b/random-test.c @@ -43,7 +43,7 @@ again: ret = radix_tree_gang_lookup(root, (void **)res, num, 2); if (exists) { if (ret == 0) - return -1; + return -EEXIST; num = res[0]; } else if (ret != 0 && num == res[0]) { num++; @@ -79,7 +79,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root, return ret; error: printf("failed to insert %llu\n", (unsigned long long)key.objectid); - return -1; + return ret; } static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root @@ -98,7 +98,7 @@ static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root if (ret != -EEXIST) { printf("insert on %llu gave us %d\n", (unsigned long long)key.objectid, ret); - return 1; + return ret; } return 0; } @@ -127,7 +127,7 @@ static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root, return 0; error: printf("failed to delete %llu\n", (unsigned long long)key.objectid); - return -1; + return ret; } static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root @@ -147,7 +147,7 @@ static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root return 0; error: printf("unable to find key %llu\n", (unsigned long long)key.objectid); - return -1; + return ret; } static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root @@ -168,7 +168,7 @@ static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root error: printf("able to find key that should not exist %llu\n", (unsigned long long)key.objectid); - return -1; + return -EEXIST; } static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root @@ -209,7 +209,7 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root fprintf(stderr, "failed to remove %lu from tree\n", found); - return -1; + return ret; } btrfs_release_path(&path); ptr = radix_tree_delete(radix, found); @@ -221,7 +221,7 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root return 0; error: fprintf(stderr, "failed to delete from the radix %lu\n", found); - return -1; + return -ENOENT; } static int fill_tree(struct btrfs_trans_handle *trans, struct btrfs_root *root, @@ -428,6 +428,6 @@ int main(int ac, char **av) } out: close_ctree(root, &super); - return err; + return !!err; }