Prechádzať zdrojové kódy

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>
Arne Jansen 13 rokov pred
rodič
commit
b9688bb845
1 zmenil súbory, kde vykonal 3 pridanie a 6 odobranie
  1. 3 6
      fs/btrfs/extent-tree.c

+ 3 - 6
fs/btrfs/extent-tree.c

@@ -3771,13 +3771,10 @@ again:
 		 */
 		 */
 		if (current->journal_info)
 		if (current->journal_info)
 			return -EAGAIN;
 			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;
 			return -EINTR;
-		}
 
 
 		spin_lock(&space_info->lock);
 		spin_lock(&space_info->lock);
 	}
 	}