提交 b9688bb8 编写于 作者: A Arne Jansen 提交者: David Sterba

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: NArne Jansen <sensille@gmx.net>
上级 253beebd
...@@ -3771,13 +3771,10 @@ static int reserve_metadata_bytes(struct btrfs_root *root, ...@@ -3771,13 +3771,10 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
*/ */
if (current->journal_info) if (current->journal_info)
return -EAGAIN; return -EAGAIN;
ret = wait_event_interruptible(space_info->wait, ret = wait_event_killable(space_info->wait, !space_info->flush);
!space_info->flush); /* Must have been killed, return */
/* Must have been interrupted, return */ if (ret)
if (ret) {
printk(KERN_DEBUG "btrfs: %s returning -EINTR\n", __func__);
return -EINTR; return -EINTR;
}
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册