---

yaml
---
r: 217497
b: refs/heads/master
c: f3ab263
h: refs/heads/master
i:
  217495: f947b61
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 809c444977adb7313e0612e9e3af4b73ba3f5746
+refs/heads/master: f3ab2636c5c1dd9ab0ff53a46d8354d5769ffdd4

trunk/mm/memory_hotplug.c

@@ -705,24 +705,21 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 			   check this again here. */
 			if (page_count(page)) {
 				not_managed++;
+				ret = -EBUSY;
 				break;
 			}
 		}
 	}
-	ret = -EBUSY;
-	if (not_managed) {
-		if (!list_empty(&source))
+	if (!list_empty(&source)) {
+		if (not_managed) {
+			putback_lru_pages(&source);
+			goto out;
+		}
+		/* this function returns # of failed pages */
+		ret = migrate_pages(&source, hotremove_migrate_alloc, 0, 1);
+		if (ret)
 			putback_lru_pages(&source);
-		goto out;
 	}
-	ret = 0;
-	if (list_empty(&source))
-		goto out;
-	/* this function returns # of failed pages */
-	ret = migrate_pages(&source, hotremove_migrate_alloc, 0, 1);
-	if (ret)
-		putback_lru_pages(&source);
-
 out:
 	return ret;
 }