---

yaml --- r: 255027 b: refs/heads/master c: b307d46 h: refs/heads/master i: 255025: 8e86bc4 255023: 7996c75 v: v3
git-mirror · Jul 21, 2011 · 7e4b870 · 7e4b870
1 parent 5865425
commit 7e4b870
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6ace16a3cd8b728fb0afa68368fd40bbeae19f
+refs/heads/master: b307d4655a71749ac3f91c6dbe33d28cc026ceeb
diff --git a/trunk/fs/fscache/page.c b/trunk/fs/fscache/page.c
@@ -976,24 +976,20 @@ void __fscache_uncache_all_inode_pages(struct fscache_cookie *cookie,
 
 	pagevec_init(&pvec, 0);
 	next = 0;
-	while (next <= (loff_t)-1 &&
-	       pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)
-	       ) {
+	do {
+		if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE))
+			break;
 		for (i = 0; i < pagevec_count(&pvec); i++) {
 			struct page *page = pvec.pages[i];
-			pgoff_t page_index = page->index;
-
-			ASSERTCMP(page_index, >=, next);
-			next = page_index + 1;
-
+			next = page->index;
 			if (PageFsCache(page)) {
 				__fscache_wait_on_page_write(cookie, page);
 				__fscache_uncache_page(cookie, page);
 			}
 		}
 		pagevec_release(&pvec);
 		cond_resched();
-	}
+	} while (++next);
 
 	_leave("");
 }