openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs_get_extent should treat inline extents as though they hold a whole block 

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-09-20 14:14:42 -04:00
parent b3cfa35a49
commit 50b78c24d5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/inode.c
View File

@ -1505,13 +1505,13 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
size = btrfs_file_extent_inline_len(leaf->items +
path->slots[0]);
extent_end = extent_start + size;
extent_end = extent_start | ((u64)root->blocksize - 1);
if (start < extent_start || start >= extent_end) {
em->start = start;
if (start < extent_start) {
if (end < extent_start)
goto not_found;
em->end = extent_end - 1;
em->end = extent_end;
} else {
em->end = end;
}
@ -1520,17 +1520,19 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
em->block_start = EXTENT_MAP_INLINE;
em->block_end = EXTENT_MAP_INLINE;
em->start = extent_start;
em->end = extent_end - 1;
em->end = extent_end;
if (!page) {
goto insert;
}
ptr = btrfs_file_extent_inline_start(item);
map = kmap(page);
memcpy(map + page_offset, ptr, size);
flush_dcache_page(result->b_page);
memset(map + page_offset + size, 0,
root->blocksize - (page_offset + size));
flush_dcache_page(page);
kunmap(page);
set_extent_uptodate(em_tree, extent_start,
extent_end - 1, GFP_NOFS);
extent_end, GFP_NOFS);
goto insert;
} else {
printk("unkknown found_type %d\n", found_type);