aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/btrfs/extent-tree.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a0bb9dcd3c36..84497f8eb043 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3771,13 +3771,10 @@ again:
3771 */ 3771 */
3772 if (current->journal_info) 3772 if (current->journal_info)
3773 return -EAGAIN; 3773 return -EAGAIN;
3774 ret = wait_event_interruptible(space_info->wait, 3774 ret = wait_event_killable(space_info->wait, !space_info->flush);
3775 !space_info->flush); 3775 /* Must have been killed, return */
3776 /* Must have been interrupted, return */ 3776 if (ret)
3777 if (ret) {
3778 printk(KERN_DEBUG "btrfs: %s returning -EINTR\n", __func__);
3779 return -EINTR; 3777 return -EINTR;
3780 }
3781 3778
3782 spin_lock(&space_info->lock); 3779 spin_lock(&space_info->lock);
3783 } 3780 }