From: Jeff Mahoney <jeffm@suse.com>
To: Btrfs List <linux-btrfs@vger.kernel.org>
Subject: [patch 02/99] btrfs: Catch locking failures in {set,clear,convert}_extent_bit
Date: Wed, 23 Nov 2011 19:35:35 -0500 [thread overview]
Message-ID: <20111124004220.048994767@suse.com> (raw)
In-Reply-To: 20111124003533.395674389@suse.com
The *_state functions can only return 0 or -EEXIST. This patch addresses
the cases where those functions returning -EEXIST represent a locking
failure. It handles them by panicking with an appropriate error message.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
fs/btrfs/extent_io.c | 58 +++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 20 deletions(-)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -51,6 +51,12 @@ struct extent_page_data {
unsigned int sync_io:1;
};
+static inline struct btrfs_fs_info *
+tree_fs_info(struct extent_io_tree *tree)
+{
+ return btrfs_sb(tree->mapping->host->i_sb)->fs_info;
+}
+
int __init extent_io_init(void)
{
extent_state_cache = kmem_cache_create("extent_state",
@@ -437,6 +443,13 @@ alloc_extent_state_atomic(struct extent_
return prealloc;
}
+NORET_TYPE void extent_io_tree_panic(struct extent_io_tree *tree, int err)
+{
+ btrfs_panic(tree_fs_info(tree), err, "Locking error: "
+ "Extent tree was modified by another "
+ "thread while locked.");
+}
+
/*
* clear some bits on a range in the tree. This may require splitting
* or inserting elements in the tree, so the gfp mask is used to
@@ -531,7 +544,9 @@ hit_next:
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = split_state(tree, state, prealloc, start);
- BUG_ON(err == -EEXIST);
+ if (err)
+ extent_io_tree_panic(tree, err);
+
prealloc = NULL;
if (err)
goto out;
@@ -553,7 +568,9 @@ hit_next:
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = split_state(tree, state, prealloc, end + 1);
- BUG_ON(err == -EEXIST);
+ if (err)
+ extent_io_tree_panic(tree, err);
+
if (wake)
wake_up(&state->wq);
@@ -736,8 +753,10 @@ again:
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = insert_state(tree, prealloc, start, end, &bits);
+ if (err)
+ extent_io_tree_panic(tree, err);
+
prealloc = NULL;
- BUG_ON(err == -EEXIST);
goto out;
}
state = rb_entry(node, struct extent_state, rb_node);
@@ -803,7 +822,9 @@ hit_next:
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = split_state(tree, state, prealloc, start);
- BUG_ON(err == -EEXIST);
+ if (err)
+ extent_io_tree_panic(tree, err);
+
prealloc = NULL;
if (err)
goto out;
@@ -840,12 +861,9 @@ hit_next:
*/
err = insert_state(tree, prealloc, start, this_end,
&bits);
- BUG_ON(err == -EEXIST);
- if (err) {
- free_extent_state(prealloc);
- prealloc = NULL;
- goto out;
- }
+ if (err)
+ extent_io_tree_panic(tree, err);
+
cache_state(prealloc, cached_state);
prealloc = NULL;
start = this_end + 1;
@@ -867,7 +885,8 @@ hit_next:
prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc);
err = split_state(tree, state, prealloc, end + 1);
- BUG_ON(err == -EEXIST);
+ if (err)
+ extent_io_tree_panic(tree, err);
set_state_bits(tree, prealloc, &bits);
cache_state(prealloc, cached_state);
#@@ -938,7 +957,8 @@ again:
# return -ENOMEM;
# err = insert_state(tree, prealloc, start, end, &bits);
# prealloc = NULL;
#- BUG_ON(err == -EEXIST);
#+ if (err)
#+ extent_io_tree_panic(tree, err);
# goto out;
# }
# state = rb_entry(node, struct extent_state, rb_node);
#@@ -994,7 +1014,8 @@ hit_next:
# if (!prealloc)
# return -ENOMEM;
# err = split_state(tree, state, prealloc, start);
#- BUG_ON(err == -EEXIST);
#+ if (err)
#+ extent_io_tree_panic(tree, err);
# prealloc = NULL;
# if (err)
# goto out;
#@@ -1032,12 +1053,8 @@ hit_next:
# */
# err = insert_state(tree, prealloc, start, this_end,
# &bits);
#- BUG_ON(err == -EEXIST);
#- if (err) {
#- free_extent_state(prealloc);
#- prealloc = NULL;
#- goto out;
#- }
#+ if (err)
#+ extent_io_tree_panic(tree, err);
# prealloc = NULL;
# start = this_end + 1;
# goto search_again;
#@@ -1054,7 +1071,8 @@ hit_next:
# return -ENOMEM;
#
# err = split_state(tree, state, prealloc, end + 1);
#- BUG_ON(err == -EEXIST);
#+ if (err)
#+ extent_io_tree_panic(tree, err);
#
# set_state_bits(tree, prealloc, &bits);
# clear_state_bit(tree, prealloc, &clear_bits, 0);
next prev parent reply other threads:[~2011-11-24 0:35 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 0:35 [patch 00/99] Error handling patchset v6 Jeff Mahoney
2011-11-24 0:35 ` [patch 01/99] btrfs: Add btrfs_panic() Jeff Mahoney
2011-11-24 2:05 ` David Brown
2011-11-24 2:22 ` Jeff Mahoney
2011-11-24 6:37 ` David Brown
2011-11-25 2:36 ` Jeff Mahoney
2011-11-25 5:42 ` David Brown
2011-11-24 0:35 ` Jeff Mahoney [this message]
2011-11-24 0:35 ` [patch 03/99] btrfs: Panic on bad rbtree operations Jeff Mahoney
2011-11-24 23:41 ` David Sterba
2011-11-25 2:13 ` Jeff Mahoney
2011-11-24 0:35 ` [patch 04/99] btrfs: Simplify btrfs_insert_root Jeff Mahoney
2011-11-24 0:35 ` [patch 05/99] btrfs: Remove set bits return from clear_extent_bit Jeff Mahoney
2011-11-24 0:35 ` [patch 06/99] btrfs: Add extent_state alloc/free tracing Jeff Mahoney
2011-11-24 0:35 ` [patch 07/99] btrfs: Use mempools for extent_state structures Jeff Mahoney
2011-11-28 23:53 ` Andi Kleen
2011-11-29 0:04 ` Jeff Mahoney
2011-12-01 19:55 ` Jeff Mahoney
2011-12-03 4:53 ` Jeff Mahoney
2011-11-24 0:35 ` [patch 08/99] btrfs: clear_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24 0:35 ` [patch 09/99] btrfs: unlock_extent can return void Jeff Mahoney
2011-11-24 0:35 ` [patch 10/99] btrfs: Split unlock_extent_cached into sleeping and atomic versions Jeff Mahoney
2011-11-24 0:35 ` [patch 11/99] btrfs: unlock_extent can drop gfp_t argument Jeff Mahoney
2011-11-24 0:35 ` [patch 12/99] btrfs: clear_extent_dirty " Jeff Mahoney
2011-11-24 0:35 ` [patch 13/99] btrfs: clear_extent_uptodate can drop gfp_t argumetn Jeff Mahoney
2011-11-24 23:57 ` David Sterba
2011-11-25 2:14 ` Jeff Mahoney
2011-11-24 0:35 ` [patch 14/99] btrfs: clear_extent_bits " Jeff Mahoney
2011-11-24 0:35 ` [patch 15/99] btrfs: try_lock_extent " Jeff Mahoney
2011-11-24 0:35 ` [patch 16/99] btrfs: clear_extent_bit can drop gfp_t argument Jeff Mahoney
2011-11-24 0:35 ` [patch 17/99] btrfs: set_extent_bit: split exclusive mode out Jeff Mahoney
2011-11-24 0:35 ` [patch 18/99] btrfs: set_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24 0:35 ` [patch 19/99] btrfs: lock_extent can drop gfp_t argument Jeff Mahoney
2011-11-24 0:35 ` [patch 20/99] btrfs: set_extent_dirty " Jeff Mahoney
2011-11-24 0:35 ` [patch 21/99] btrfs: set_extent_bits " Jeff Mahoney
2011-11-24 0:35 ` [patch 22/99] btrfs: set_extent_delalloc " Jeff Mahoney
2011-11-24 0:35 ` [patch 23/99] btrfs: set_extent_new " Jeff Mahoney
2011-11-24 0:35 ` [patch 24/99] btrfs: set_extent_uptodate " Jeff Mahoney
2011-11-24 0:35 ` [patch 25/99] btrfs: set_extent_bit " Jeff Mahoney
2011-11-24 0:35 ` [patch 26/99] btrfs: set_extent_buffer_uptodate should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 27/99] btrfs: set_extent_bit should return -ENOMEM on GFP_ATOMIC failures Jeff Mahoney
2011-11-24 0:36 ` [patch 28/99] btrfs: clear_extent_bit error push-up Jeff Mahoney
2011-11-24 0:36 ` [patch 29/99] btrfs: convert_extent_bit should return void with __GFP_WAIT set Jeff Mahoney
2011-11-24 0:36 ` [patch 30/99] btrfs: pin_down_extent should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 31/99] btrfs: btrfs_pin_extent error push-up Jeff Mahoney
2011-11-24 0:36 ` [patch 32/99] btrfs: btrfs_drop_snapshot should return int Jeff Mahoney
2011-11-24 0:36 ` [patch 33/99] btrfs: btrfs_start_transaction non-looped error push-up Jeff Mahoney
2011-11-24 0:36 ` [patch 34/99] btrfs: find_and_setup_root " Jeff Mahoney
2011-11-24 0:36 ` [patch 35/99] btrfs: btrfs_update_root " Jeff Mahoney
2011-11-24 0:36 ` [patch 36/99] btrfs: set_range_writeback should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 37/99] btrfs: wait_on_state " Jeff Mahoney
2011-11-24 0:36 ` [patch 38/99] btrfs: wait_extent_bit " Jeff Mahoney
2011-11-24 0:36 ` [patch 39/99] btrfs: __unlock_for_delalloc " Jeff Mahoney
2011-11-24 0:36 ` [patch 40/99] btrfs: check_page_uptodate " Jeff Mahoney
2011-11-24 0:36 ` [patch 41/99] btrfs: check_page_locked " Jeff Mahoney
2011-11-24 0:36 ` [patch 42/99] btrfs: check_page_writeback " Jeff Mahoney
2011-11-24 0:36 ` [patch 43/99] btrfs: clear_extent_buffer_dirty " Jeff Mahoney
2011-11-24 0:36 ` [patch 44/99] btrfs: btrfs_cleanup_fs_uuids " Jeff Mahoney
2011-11-24 0:36 ` [patch 45/99] btrfs: run_scheduled_bios " Jeff Mahoney
2011-11-24 0:36 ` [patch 46/99] btrfs: btrfs_close_extra_devices " Jeff Mahoney
2011-11-24 0:36 ` [patch 47/99] btrfs: schedule_bio " Jeff Mahoney
2011-11-24 0:36 ` [patch 48/99] btrfs: fill_device_from_item " Jeff Mahoney
2011-11-24 0:36 ` [patch 49/99] btrfs: btrfs_queue_worker " Jeff Mahoney
2011-11-24 0:36 ` [patch 50/99] btrfs: run_ordered_completions " Jeff Mahoney
2011-11-24 0:36 ` [patch 51/99] btrfs: btrfs_stop_workers " Jeff Mahoney
2011-11-24 0:36 ` [patch 52/99] btrfs: btrfs_requeue_work " Jeff Mahoney
2011-11-24 0:36 ` [patch 53/99] btrfs: btrfs_end_log_trans " Jeff Mahoney
2011-11-24 0:36 ` [patch 54/99] btrfs: wait_for_writer " Jeff Mahoney
2011-11-24 0:36 ` [patch 55/99] btrfs: btrfs_init_compress " Jeff Mahoney
2011-11-24 0:36 ` [patch 56/99] btrfs: btrfs_invalidate_inodes " Jeff Mahoney
2011-11-24 0:36 ` [patch 57/99] btrfs: __setup_root " Jeff Mahoney
2011-11-24 0:36 ` [patch 58/99] btrfs: btrfs_destroy_delalloc_inodes " Jeff Mahoney
2011-11-24 0:36 ` [patch 59/99] btrfs: btrfs_prepare_extent_commit " Jeff Mahoney
2011-11-24 0:36 ` [patch 60/99] btrfs: btrfs_set_block_group_rw " Jeff Mahoney
2011-11-24 0:36 ` [patch 61/99] btrfs: setup_inline_extent_backref " Jeff Mahoney
2011-11-24 0:36 ` [patch 62/99] btrfs: btrfs_run_defrag_inodes " Jeff Mahoney
2011-11-24 0:36 ` [patch 63/99] btrfs: Simplify btrfs_submit_bio_hook Jeff Mahoney
2011-11-24 0:36 ` [patch 64/99] btrfs: Factor out tree->ops->merge_bio_hook call Jeff Mahoney
2011-11-24 0:36 ` [patch 65/99] btrfs: ->submit_bio_hook error push-up Jeff Mahoney
2011-11-25 0:46 ` David Sterba
2011-11-25 2:17 ` Jeff Mahoney
2011-11-24 0:36 ` [patch 66/99] btrfs: __add_reloc_root " Jeff Mahoney
2011-11-24 0:36 ` [patch 67/99] btrfs: fixup_low_keys should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 68/99] btrfs: setup_items_for_insert " Jeff Mahoney
2011-11-24 0:36 ` [patch 69/99] btrfs: del_ptr " Jeff Mahoney
2011-11-24 0:36 ` [patch 70/99] btrfs: insert_ptr " Jeff Mahoney
2011-11-24 0:36 ` [patch 71/99] btrfs: add_delayed_ref_head " Jeff Mahoney
2011-11-24 0:36 ` [patch 72/99] btrfs: add_delayed_tree_ref " Jeff Mahoney
2011-11-24 0:36 ` [patch 73/99] btrfs: add_delayed_data_ref " Jeff Mahoney
2011-11-24 0:36 ` [patch 74/99] btrfs: Fix kfree of member instead of structure Jeff Mahoney
2011-11-24 0:36 ` [patch 75/99] btrfs: Use mempools for delayed refs Jeff Mahoney
2011-11-24 0:36 ` [patch 76/99] btrfs: Delayed ref mempool functions should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 77/99] btrfs: btrfs_inc_extent_ref void return prep Jeff Mahoney
2011-11-24 0:36 ` [patch 78/99] btrfs: btrfs_free_extent " Jeff Mahoney
2011-11-24 0:36 ` [patch 79/99] btrfs: __btrfs_mod_refs process_func should return void Jeff Mahoney
2011-11-24 0:36 ` [patch 80/99] btrfs: __btrfs_mod_ref " Jeff Mahoney
2011-11-24 0:36 ` [patch 81/99] btrfs: clean_tree_block " Jeff Mahoney
2011-11-24 0:36 ` [patch 82/99] btrfs: btrfs_truncate_item " Jeff Mahoney
2011-11-24 0:36 ` [patch 83/99] btrfs: btrfs_extend_item " Jeff Mahoney
2011-11-24 0:36 ` [patch 84/99] btrfs: end_compressed_writeback " Jeff Mahoney
2011-11-24 0:36 ` [patch 85/99] btrfs: copy_for_split " Jeff Mahoney
2011-11-24 0:36 ` [patch 86/99] btrfs: update_inline_extent_backref " Jeff Mahoney
2011-11-24 0:37 ` [patch 87/99] btrfs: btrfs_put_ordered_extent " Jeff Mahoney
2011-11-24 0:37 ` [patch 88/99] btrfs: __btrfs_remove_ordered_extent " Jeff Mahoney
2011-11-24 0:37 ` [patch 89/99] btrfs: btrfs_wait_ordered_extents " Jeff Mahoney
2011-11-24 0:37 ` [patch 90/99] btrfs: btrfs_wait_ordered_range " Jeff Mahoney
2011-11-24 0:37 ` [patch 91/99] btrfs: btrfs_run_ordered_operations " Jeff Mahoney
2011-11-24 0:37 ` [patch 92/99] btrfs: btrfs_add_ordered_operation " Jeff Mahoney
2011-11-24 0:37 ` [patch 93/99] btrfs: btrfs_add_ordered_sum " Jeff Mahoney
2011-11-24 0:37 ` [patch 94/99] btrfs: btrfs_free_fs_root " Jeff Mahoney
2011-11-24 0:37 ` [patch 95/99] btrfs: del_fs_roots " Jeff Mahoney
2011-11-24 0:37 ` [patch 96/99] btrfs: btrfs_destroy_ordered_operations " Jeff Mahoney
2011-11-24 0:37 ` [patch 97/99] btrfs: btrfs_destroy_ordered_extents " Jeff Mahoney
2011-11-24 0:37 ` [patch 98/99] btrfs: btrfs_destroy_pending_snapshots " Jeff Mahoney
2011-11-24 0:37 ` [patch 99/99] btrfs: add_excluded_extent " Jeff Mahoney
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=20111124004220.048994767@suse.com \
--to=jeffm@suse.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).