1 files changed, 2 insertions, 1 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1c82bead2c08..3d19dcc553aa 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -442,7 +442,8 @@ next:
                         if (ret)
                                 break;
 
-                        if (need_resched()) {
+                        if (need_resched() ||
+                            rwsem_is_contended(&fs_info->extent_commit_sem)) {
                                 caching_ctl->progress = last;
                                 btrfs_release_path(path);
                                 up_read(&fs_info->extent_commit_sem);