path: root/fs
diff options
authorArne Jansen <sensille@gmx.net>2012-04-18 10:27:16 +0200
committerDavid Sterba <dsterba@suse.cz>2012-04-18 19:22:33 +0200
commitb9688bb8459b67e42327de6420edb405a9188775 (patch)
tree90f1b5be9f4829463082e24357f5c9a5677797f3 /fs
parent253beebd5a255e07d6a8b65515491f33664e82a2 (diff)
btrfs: don't return EINTR
It is basically a good thing if we are interruptible when waiting for free space, but the generality in which it is implemented currently leads to system calls being interruptible that are not documented this way. For example git can't handle interrupted unlink(), leading to corrupt repos under space pressure. Instead we raise the bar to only be interruptible by SIGKILL. Thanks to David Sterba for suggesting this. Signed-off-by: Arne Jansen <sensille@gmx.net>
Diffstat (limited to 'fs')
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:
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;
- }