---

yaml --- r: 273226 b: refs/heads/master c: 0693bc9 h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · 8b03fe5 · 8b03fe5
1 parent d0112ad
commit 8b03fe5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 220a2eb228d032acde60e9fd044ca802706ff583
+refs/heads/master: 0693bc9ce2cc4f6a1b9c3c05790fc149a74c0b87
diff --git a/trunk/arch/s390/mm/gup.c b/trunk/arch/s390/mm/gup.c
@@ -93,16 +93,17 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
 		*nr -= refs;
 		while (refs--)
 			put_page(head);
-	} else {
-		/*
-		 * Any tail page need their mapcount reference taken
-		 * before we return.
-		 */
-		while (refs--) {
-			if (PageTail(tail))
-				get_huge_page_tail(tail);
-			tail++;
-		}
+		return 0;
+	}
+
+	/*
+	 * Any tail page need their mapcount reference taken before we
+	 * return.
+	 */
+	while (refs--) {
+		if (PageTail(tail))
+			get_huge_page_tail(tail);
+		tail++;
 	}
 
 	return 1;