---

yaml --- r: 139619 b: refs/heads/master c: 58984ce h: refs/heads/master i: 139617: 3238301 139615: ed9d767 v: v3
git-mirror · Apr 3, 2009 · 4aa0862 · 4aa0862
1 parent 17def0a
commit 4aa0862
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 417b43d4b728619e9bcc2da4fa246a6350d46667
+refs/heads/master: 58984ce21d315b70df1a43644df7416ea7c9bfd8
diff --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c
@@ -89,8 +89,8 @@ do_xip_mapping_read(struct address_space *mapping,
 			}
 		}
 		nr = nr - offset;
-		if (nr > len)
-			nr = len;
+		if (nr > len - copied)
+			nr = len - copied;
 
 		error = mapping->a_ops->get_xip_mem(mapping, index, 0,
 							&xip_mem, &xip_pfn);