---

yaml --- r: 165895 b: refs/heads/master c: 93c82d5 h: refs/heads/master i: 165893: 56aab71 165891: c11457d 165887: 0599574 v: v3
git-mirror · Sep 11, 2009 · 6291dcb · 6291dcb
1 parent 54a7f62
commit 6291dcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50a9b214bc6c052caa05a210ebfc1bdf0d7085b2
+refs/heads/master: 93c82d575055f1bd0277acae6f966bebafd80dd5
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -4233,6 +4233,11 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 				map = kmap(page);
 				read_extent_buffer(leaf, map + pg_offset, ptr,
 						   copy_size);
+				if (pg_offset + copy_size < PAGE_CACHE_SIZE) {
+					memset(map + pg_offset + copy_size, 0,
+					       PAGE_CACHE_SIZE - pg_offset -
+					       copy_size);
+				}
 				kunmap(page);
 			}
 			flush_dcache_page(page);