All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20200131061401.ycakxmN7T%akpm@linux-foundation.org>

diff --git a/a/1.txt b/N1/1.txt
index e21282e..4815cc0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -157,4 +157,23 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 -	/*
 -	 * immobile means "not-on-lru" pages. If immobile is larger than
 -	 * removable-by-driver pages reported by notifier, we'll fail.
--	 */
\ No newline at end of file
+-	 */
+-
+-out:
+-	if (!ret) {
++	if (!has_unmovable_pages(zone, page, 0, migratetype, isol_flags)) {
+ 		unsigned long nr_pages;
+ 		int mt = get_pageblock_migratetype(page);
+ 
+@@ -79,8 +47,10 @@ out:
+ 									NULL);
+ 
+ 		__mod_zone_freepage_state(zone, -nr_pages, mt);
++		ret = 0;
+ 	}
+ 
++out:
+ 	spin_unlock_irqrestore(&zone->lock, flags);
+ 	if (!ret)
+ 		drain_all_pages(zone);
+_
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 32a0758..e151b1d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -193,7 +193,26 @@
   "-\t/*\n",
   "-\t * immobile means \"not-on-lru\" pages. If immobile is larger than\n",
   "-\t * removable-by-driver pages reported by notifier, we'll fail.\n",
-  "-\t */"
+  "-\t */\n",
+  "-\n",
+  "-out:\n",
+  "-\tif (!ret) {\n",
+  "+\tif (!has_unmovable_pages(zone, page, 0, migratetype, isol_flags)) {\n",
+  " \t\tunsigned long nr_pages;\n",
+  " \t\tint mt = get_pageblock_migratetype(page);\n",
+  " \n",
+  "\@\@ -79,8 +47,10 \@\@ out:\n",
+  " \t\t\t\t\t\t\t\t\tNULL);\n",
+  " \n",
+  " \t\t__mod_zone_freepage_state(zone, -nr_pages, mt);\n",
+  "+\t\tret = 0;\n",
+  " \t}\n",
+  " \n",
+  "+out:\n",
+  " \tspin_unlock_irqrestore(&zone->lock, flags);\n",
+  " \tif (!ret)\n",
+  " \t\tdrain_all_pages(zone);\n",
+  "_"
 ]
 
-77ff87c5f755ec36f97234e574703204cba6b00b4947659a3c5aa4a4d892fcc5
+b8a7f9c4b4e7576f360b8eb7877738695c03e46b71a922051e26464ee786caab
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.