aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-08-14 11:33:56 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-01 08:05:04 -0400
commit9ffba8cda917c0158857426f0e74b64d0206aaa9 (patch)
tree04579a95f2f494d0563d84c331be849aa4980977 /fs/btrfs/disk-io.c
parent4ef31a45a009a81b2f3c5aaf6f07d7147f80bc8c (diff)
Btrfs: fix heavy delalloc related deadlock
I added a patch where we started taking the ordered operations mutex when we waited on ordered extents. We need this because we splice the list and process it, so if a flusher came in during this scenario it would think the list was empty and we'd usually get an early ENOSPC. The problem with this is that this lock is used in transaction committing. So we end up with something like this Transaction commit -> wait on writers Delalloc flusher -> run_ordered_operations (holds mutex) ->wait for filemap-flush to do its thing flush task -> cow_file_range ->wait on btrfs_join_transaction because we're commiting some other task -> commit_transaction because we notice trans->transaction->flush is set -> run_ordered_operations (hang on mutex) We need to disentangle the ordered operations flushing from the delalloc flushing, since they are separate things. This solves the deadlock issue I was seeing. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 572e21eb644c..68391ecf2c59 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2277,6 +2277,7 @@ int open_ctree(struct super_block *sb,
2277 2277
2278 2278
2279 mutex_init(&fs_info->ordered_operations_mutex); 2279 mutex_init(&fs_info->ordered_operations_mutex);
2280 mutex_init(&fs_info->ordered_extent_flush_mutex);
2280 mutex_init(&fs_info->tree_log_mutex); 2281 mutex_init(&fs_info->tree_log_mutex);
2281 mutex_init(&fs_info->chunk_mutex); 2282 mutex_init(&fs_info->chunk_mutex);
2282 mutex_init(&fs_info->transaction_kthread_mutex); 2283 mutex_init(&fs_info->transaction_kthread_mutex);