diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-04-04 11:55:49 -0400 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-06 15:54:32 -0400 |
| commit | 98ad69cfd2ca8e27250af839bacda1639a7dc3a4 (patch) | |
| tree | 4a659ebbbd366b0dd04923197509b7ccc578b8da /fs/btrfs/extent-tree.c | |
| parent | 8c579fe745d96d0841c28295c10ac3e427cef9f2 (diff) | |
| download | op-kernel-dev-98ad69cfd2ca8e27250af839bacda1639a7dc3a4.zip op-kernel-dev-98ad69cfd2ca8e27250af839bacda1639a7dc3a4.tar.gz | |
Btrfs: don't wait on ordered extents if we have a trans open
Dave was hitting a lockdep warning because we're now properly taking the ordered
operations mutex in the ordered wait stuff. This is because some cases we will
have a trans handle when we are flushing delalloc space, but we can't wait on
ordered extents because we could potentially deadlock, so fix this by not doing
the wait if we have a trans handle. Thanks
Reported-and-tested-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index cba98c1..bea20fe 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3920,7 +3920,8 @@ void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root, * the disk). */ btrfs_start_delalloc_inodes(root, 0); - btrfs_wait_ordered_extents(root, 0); + if (!current->journal_info) + btrfs_wait_ordered_extents(root, 0); } } |
