linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Fasheh <mfasheh@suse.de>
To: linux-btrfs@vger.kernel.org
Cc: Chris Mason <chris.mason@oracle.com>, Mark Fasheh <mfasheh@suse.de>
Subject: [PATCH 18/20] btrfs: Don't BUG_ON insert errors in btrfs_alloc_dev_extent()
Date: Thu, 15 Sep 2011 10:34:57 -0700	[thread overview]
Message-ID: <1316108099-5099-19-git-send-email-mfasheh@suse.de> (raw)
In-Reply-To: <1316108099-5099-1-git-send-email-mfasheh@suse.de>

The only caller of btrfs_alloc_dev_extent() is __btrfs_alloc_chunk() which
already bugs on any error returned. We can remove the BUG_ON's in
btrfs_alloc_dev_extent() then since __btrfs_alloc_chunk() will "catch" them
anyway.

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---
 fs/btrfs/volumes.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 53875ae..1f5c3b1 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1008,7 +1008,8 @@ int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
 	key.type = BTRFS_DEV_EXTENT_KEY;
 	ret = btrfs_insert_empty_item(trans, root, path, &key,
 				      sizeof(*extent));
-	BUG_ON(ret);
+	if (ret)
+		goto out;
 
 	leaf = path->nodes[0];
 	extent = btrfs_item_ptr(leaf, path->slots[0],
@@ -1023,6 +1024,7 @@ int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
 
 	btrfs_set_dev_extent_length(leaf, extent, num_bytes);
 	btrfs_mark_buffer_dirty(leaf);
+out:
 	btrfs_free_path(path);
 	return ret;
 }
-- 
1.7.6


  parent reply	other threads:[~2011-09-15 17:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15 17:34 [PATCH 0/20] btrfs: More error handling fixes Mark Fasheh
2011-09-15 17:34 ` [PATCH 01/20] btrfs: Don't BUG_ON errors from btrfs_create_subvol_root() Mark Fasheh
2011-09-15 17:34 ` [PATCH 02/20] btrfs: Don't BUG_ON() errors in update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 03/20] btrfs: Don't BUG_ON kzalloc error in btrfs_lookup_csums_range() Mark Fasheh
2011-09-15 17:34 ` [PATCH 04/20] btrfs: make insert_ptr() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 05/20] btrfs: Don't BUG_ON errors in __finish_chunk_alloc() Mark Fasheh
2011-09-15 17:34 ` [PATCH 06/20] btrfs: fix error check of btrfs_lookup_dentry() Mark Fasheh
2011-09-15 17:34 ` [PATCH 07/20] btrfs: make fixup_low_keys() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 08/20] btrfs: make del_ptr() and btrfs_del_leaf() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 09/20] btrfs: Don't BUG_ON failures in find_and_setup_root() Mark Fasheh
2011-09-15 17:34 ` [PATCH 10/20] btrfs: go readonly on insert error in btrfs_add_root_ref() Mark Fasheh
2011-09-15 17:34 ` [PATCH 11/20] btrfs: Go readonly on bad extent refs in update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 12/20] btrfs: Don't BUG_ON errors from update_ref_for_cow() Mark Fasheh
2011-09-15 17:34 ` [PATCH 13/20] btrfs: Go readonly on tree errors in balance_level Mark Fasheh
2011-09-15 17:34 ` [PATCH 14/20] btrfs: Document BUG() in find_lock_delalloc_range() Mark Fasheh
2011-09-15 17:34 ` [PATCH 15/20] btrfs: Go readonly on missing ref in btrfs_get_parent() Mark Fasheh
2011-09-15 17:34 ` [PATCH 16/20] btrfs: make add_delayed_ref_head() void Mark Fasheh
2011-09-15 17:34 ` [PATCH 17/20] btrfs: make add_delayed_tree_ref() void Mark Fasheh
2011-09-15 17:34 ` Mark Fasheh [this message]
2011-09-15 17:34 ` [PATCH 19/20] btrfs: Remove BUG_ON from __btrfs_alloc_chunk() Mark Fasheh
2011-09-15 17:34 ` [PATCH 20/20] btrfs: Remove BUG_ON from __finish_chunk_alloc() Mark Fasheh
2011-09-15 18:03 ` [PATCH 0/20] btrfs: More error handling fixes David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1316108099-5099-19-git-send-email-mfasheh@suse.de \
    --to=mfasheh@suse.de \
    --cc=chris.mason@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).