---

yaml --- r: 299663 b: refs/heads/master c: 6e8b09e h: refs/heads/master i: 299661: 8ad81a1 299659: f802f4b 299655: fc875e1 299647: 3586578 v: v3
git-mirror · Apr 26, 2012 · a02f2ce · a02f2ce
1 parent 9266cdb
commit a02f2ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a9ef880763d7fbd657a3af646e132a90d70d34
+refs/heads/master: 6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
@@ -1388,14 +1388,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 	mm = get_task_mm(task);
 	put_task_struct(task);
 
-	if (mm) {
-		if (nodes)
-			err = do_pages_move(mm, task_nodes, nr_pages, pages,
-					    nodes, status, flags);
-		else
-			err = do_pages_stat(mm, nr_pages, pages, status);
-	} else
-		err = -EINVAL;
+	if (!mm)
+		return -EINVAL;
+
+	if (nodes)
+		err = do_pages_move(mm, task_nodes, nr_pages, pages,
+				    nodes, status, flags);
+	else
+		err = do_pages_stat(mm, nr_pages, pages, status);
 
 	mmput(mm);
 	return err;