On Wed, Apr 18, 2012 at 10:27:16AM +0200, Arne Jansen wrote:
> 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@xxxxxxx>
> ---
> 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 2b35f8d..10d4bb7 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -3769,13 +3769,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);
> }
Ok I like this one,
Reviewed-by: Josef Bacik <josef@xxxxxxxxxx>
Thanks,
Josef
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
