diff options
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index fd3d9d616ff9..f2f08189903d 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -697,7 +697,8 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock, | |||
| 697 | 697 | ||
| 698 | 698 | ||
| 699 | ret = btrfs_lookup_file_extent(trans, root, &path, | 699 | ret = btrfs_lookup_file_extent(trans, root, &path, |
| 700 | inode->i_ino, iblock, 1, 0); | 700 | inode->i_ino, |
| 701 | iblock << inode->i_blkbits, 0); | ||
| 701 | if (ret < 0) { | 702 | if (ret < 0) { |
| 702 | btrfs_release_path(root, &path); | 703 | btrfs_release_path(root, &path); |
| 703 | err = ret; | 704 | err = ret; |
| @@ -737,6 +738,7 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock, | |||
| 737 | } | 738 | } |
| 738 | 739 | ||
| 739 | extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key); | 740 | extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key); |
| 741 | extent_start = extent_start >> inode->i_blkbits; | ||
| 740 | extent_start += btrfs_file_extent_offset(item); | 742 | extent_start += btrfs_file_extent_offset(item); |
| 741 | extent_end = extent_start + btrfs_file_extent_num_blocks(item); | 743 | extent_end = extent_start + btrfs_file_extent_num_blocks(item); |
| 742 | btrfs_release_path(root, &path); | 744 | btrfs_release_path(root, &path); |
| @@ -751,7 +753,8 @@ allocate: | |||
| 751 | err = 0; | 753 | err = 0; |
| 752 | goto out; | 754 | goto out; |
| 753 | } | 755 | } |
| 754 | ret = btrfs_alloc_file_extent(trans, root, objectid, iblock, | 756 | ret = btrfs_alloc_file_extent(trans, root, objectid, |
| 757 | iblock << inode->i_blkbits, | ||
| 755 | 1, extent_end, &blocknr); | 758 | 1, extent_end, &blocknr); |
| 756 | if (ret) { | 759 | if (ret) { |
| 757 | err = ret; | 760 | err = ret; |
