some email and comment tweaks

diff --git a/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch b/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch
index 9b1a9cabded0d508416d3691b7aa58a771c0c857..85c5148b87c454a3c215bf56991b39ee4537d64f 100644 (file)
--- a/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch
+++ b/queue-3.10/mm-vmscan-do-not-wait-for-page-writeback-for-gfp_nofs-allocations.patch
@@ -97,13 +97,28 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 
 ---
- mm/vmscan.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ mm/vmscan.c |   11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
 
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
-@@ -743,7 +743,7 @@ static unsigned long shrink_page_list(st
-                        * testing may_enter_fs here is liable to OOM on them.
+@@ -730,20 +730,15 @@ static unsigned long shrink_page_list(st
+                        * could easily OOM just because too many pages are in
+                        * writeback and there is nothing else to reclaim.
+                        *
+-                       * Check __GFP_IO, certainly because a loop driver
++                       * Require may_enter_fs to wait on writeback, because
++                       * fs may not have submitted IO yet. And a loop driver
+                        * thread might enter reclaim, and deadlock if it waits
+                        * on a page for which it is needed to do the write
+                        * (loop masks off __GFP_IO|__GFP_FS for this reason);
+                        * but more thought would probably show more reasons.
+-                       *
+-                       * Don't require __GFP_FS, since we're not going into
+-                       * the FS, just waiting on its writeback completion.
+-                       * Worryingly, ext4 gfs2 and xfs allocate pages with
+-                       * grab_cache_page_write_begin(,,AOP_FLAG_NOFS), so
+-                       * testing may_enter_fs here is liable to OOM on them.
                         */
                        if (global_reclaim(sc) ||
 -                          !PageReclaim(page) || !(sc->gfp_mask & __GFP_IO)) {

diff --git a/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
index 63aadc10ff0503c6d9427574bdc820db63c9f1f1..c8aad62851d689fc51a5c0c1a3b869832986dd70 100644 (file)
--- a/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
+++ b/queue-3.10/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
@@ -1,13 +1,12 @@
 From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 Date: Fri, 26 Jun 2015 03:28:24 +0200
 Subject: xen/gntdevt: Fix race condition in gntdev_release()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 
 commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream.
 

diff --git a/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
index d141c7cde03575aead1c179677b3c29ec195de59..9cdf8a491f52c17453a07e79d2fe8736b885ff23 100644 (file)
--- a/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
+++ b/queue-3.14/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
@@ -1,13 +1,12 @@
 From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 Date: Fri, 26 Jun 2015 03:28:24 +0200
 Subject: xen/gntdevt: Fix race condition in gntdev_release()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 
 commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream.
 

diff --git a/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch b/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
index 62d03c14ffdd8a0e76f2da7865fc560893bfe898..0b342f9d7bdd13aaae499ca844dbc6dd203a10d9 100644 (file)
--- a/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
+++ b/queue-4.1/xen-gntdevt-fix-race-condition-in-gntdev_release.patch
@@ -1,13 +1,12 @@
 From 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 Date: Fri, 26 Jun 2015 03:28:24 +0200
 Subject: xen/gntdevt: Fix race condition in gntdev_release()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= <marmarek@invisiblethingslab.com>
 
 commit 30b03d05e07467b8c6ec683ea96b5bffcbcd3931 upstream.