---

yaml --- r: 299812 b: refs/heads/master c: b9688bb h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · f3647b2 · f3647b2
1 parent 4b8fb6f
commit f3647b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 253beebd5a255e07d6a8b65515491f33664e82a2
+refs/heads/master: b9688bb8459b67e42327de6420edb405a9188775
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -3771,13 +3771,10 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
 		 */
 		if (current->journal_info)
 			return -EAGAIN;
-		ret = wait_event_interruptible(space_info->wait,
-					       !space_info->flush);
-		/* Must have been interrupted, return */
-		if (ret) {
-			printk(KERN_DEBUG "btrfs: %s returning -EINTR\n", __func__);
+		ret = wait_event_killable(space_info->wait, !space_info->flush);
+		/* Must have been killed, return */
+		if (ret)
 			return -EINTR;
-		}
 
 		spin_lock(&space_info->lock);
 	}