Commit b9688bb8 authored Apr 18, 2012 by Arne Jansen Committed by David Sterba Apr 18, 2012

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>

parent 253beebd

fs/btrfs/extent-tree.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message