From: Josef Bacik Date: Thu, 4 Apr 2013 15:55:49 +0000 (-0400) Subject: Btrfs: don't wait on ordered extents if we have a trans open X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98ad69cfd2ca8e27250af839bacda1639a7dc3a4;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Josef Bacik --- diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index cba98c1bcc0..bea20feed2a 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); } }