---

yaml --- r: 276630 b: refs/heads/master c: a50527b h: refs/heads/master v: v3
git-mirror · Dec 2, 2011 · b3f9102 · b3f9102
1 parent a5d52a0
commit b3f9102
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786228ab3095fe18dba3bc0d62055a123991d9d9
+refs/heads/master: a50527b19c62c808a7fca022816fff88a50b948d
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -2407,7 +2407,6 @@ static ssize_t generic_perform_write(struct file *file,
 						iov_iter_count(i));
 
 again:
-
 		/*
 		 * Bring in the user page that we will copy from _first_.
 		 * Otherwise there's a nasty deadlock on copying from the
@@ -2463,7 +2462,10 @@ static ssize_t generic_perform_write(struct file *file,
 		written += copied;
 
 		balance_dirty_pages_ratelimited(mapping);
-
+		if (fatal_signal_pending(current)) {
+			status = -EINTR;
+			break;
+		}
 	} while (iov_iter_count(i));
 
 	return written ? written : status;