diff options
| author | Arne Jansen | 2012-04-18 10:27:16 +0200 |
|---|---|---|
| committer | David Sterba | 2012-04-18 19:22:33 +0200 |
| commit | b9688bb8459b67e42327de6420edb405a9188775 (patch) | |
| tree | 90f1b5be9f4829463082e24357f5c9a5677797f3 | |
| parent | Btrfs: double unlock bug in error handling (diff) | |
| download | kernel-qcow2-linux-b9688bb8459b67e42327de6420edb405a9188775.tar.gz kernel-qcow2-linux-b9688bb8459b67e42327de6420edb405a9188775.tar.xz kernel-qcow2-linux-b9688bb8459b67e42327de6420edb405a9188775.zip | |
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>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 9 |
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; - } spin_lock(&space_info->lock); } |