From patchwork Mon Jul 8 13:21:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2824852 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 5EAC2C0AB2 for ; Mon, 8 Jul 2013 13:22:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 054892019C for ; Mon, 8 Jul 2013 13:22:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C54A620196 for ; Mon, 8 Jul 2013 13:22:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051Ab3GHNWF (ORCPT ); Mon, 8 Jul 2013 09:22:05 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:41313 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035Ab3GHNWD (ORCPT ); Mon, 8 Jul 2013 09:22:03 -0400 Received: by mail-wg0-f48.google.com with SMTP id f11so3687174wgh.15 for ; Mon, 08 Jul 2013 06:22:01 -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:x-mailer:in-reply-to:references; bh=gsdqfJgFfjXC39RUET9OUoewiyb1ncGAaRavDcMJcQo=; b=Hg+Wv7zpss4URXkIwiASCa2ZwCtxXTCsjIdT2XYv6WvhE0TyHCJzfY6fa1T5/YnESx 8WuLZNoQIhdaH+rtNa7Z3ySXSM/ptqKkkkbij3jNw6REVy//+99dM8nUXIbP9LMru9DX oX54EBE55Stx4Vk8XDRIqxMb4m+9SNqnOakTH6Z/mCWdXbzJzDBS0Qf9/L+6ub9wNyhF sDiNiLT0JsbEaK/pg+HCkLh/BVUUcOAAjiEwJYNE2tOmppxXIvXOaMu7ENA/IgB0dWLq 8c8ERBvbPHnryRef+wifQ0PkIBwYjpd2XUwP/pcAMc2SlHn5n87kM6bYMuIi6w8hzbgr LqcQ== X-Received: by 10.180.185.176 with SMTP id fd16mr4393509wic.20.1373289721621; Mon, 08 Jul 2013 06:22:01 -0700 (PDT) Received: from storm-desktop.lan (bl10-255-22.dsl.telepac.pt. [85.243.255.22]) by mx.google.com with ESMTPSA id i1sm55072801wiz.6.2013.07.08.06.22.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Jul 2013 06:22:00 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH v2 5/5] Btrfs-progs: don't ignore errors in extent-tree.c Date: Mon, 8 Jul 2013 14:21:24 +0100 Message-Id: <1373289684-9441-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372593106-6593-1-git-send-email-fdmanana@gmail.com> References: <1372593106-6593-1-git-send-email-fdmanana@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=-7.1 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 Several function return values were being completely ignored. V2: Added more error checking all over extent-tree.c Signed-off-by: Filipe David Borba Manana --- extent-tree.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index 6490d8a..6458ce4 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -2110,6 +2110,7 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, extent_op->flags, &extent_op->key, extent_op->level, &key); + BUG_ON(ret); } else { BUG_ON(1); } @@ -2756,7 +2757,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, ret = update_block_group(trans, root, ins->objectid, root->leafsize, 1, 0); - return 0; + return ret; } static int alloc_tree_block(struct btrfs_trans_handle *trans, @@ -3345,12 +3346,14 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type, BUG_ON(ret); bit = block_group_state_bits(type); - set_extent_bits(block_group_cache, chunk_offset, - chunk_offset + size - 1, - bit | EXTENT_LOCKED, GFP_NOFS); + ret = set_extent_bits(block_group_cache, chunk_offset, + chunk_offset + size - 1, + bit | EXTENT_LOCKED, GFP_NOFS); + BUG_ON(ret); - set_state_private(block_group_cache, chunk_offset, - (unsigned long)cache); + ret = set_state_private(block_group_cache, chunk_offset, + (unsigned long)cache); + BUG_ON(ret); set_avail_alloc_bits(fs_info, type); return cache; @@ -3372,8 +3375,11 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, sizeof(cache->item)); BUG_ON(ret); - finish_current_insert(trans, extent_root); + ret = finish_current_insert(trans, extent_root); + BUG_ON(ret); ret = del_pending_extents(trans, extent_root); + BUG_ON(ret); + return 0; }