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);