From 6291dcb07dd87af86a113a59901e83f5aff87df5 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 11 Sep 2009 12:36:29 -0400
Subject: [PATCH] --- yaml --- r: 165895 b: refs/heads/master c:
 93c82d575055f1bd0277acae6f966bebafd80dd5 h: refs/heads/master i:   165893:
 56aab7191c3bda6cda4c21f9d01d83b8152591b7   165891:
 c11457d9cb8629d07ae351be3e887c270284c8c8   165887:
 0599574260c130641aaf6115c77cf9fe98747b42 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 496e570a8f27..358fae6df1ea 100644
--- 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
index c846482e7985..88f9df7bfdae 100644
--- 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);