diff options
| author | Linus Torvalds | 2018-06-15 00:23:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-15 00:23:00 +0200 |
| commit | e7655d2b25466c534ed1f539367dae595bb0bd20 (patch) | |
| tree | a6d6c0fdfdca3a960c6dda65e2cff7684027c4c7 /fs/btrfs/extent_io.c | |
| parent | Kbuild: rename HAVE_CC_STACKPROTECTOR config variable (diff) | |
| parent | btrfs: scrub: Don't use inode pages for device replace (diff) | |
| download | kernel-qcow2-linux-e7655d2b25466c534ed1f539367dae595bb0bd20.tar.gz kernel-qcow2-linux-e7655d2b25466c534ed1f539367dae595bb0bd20.tar.xz kernel-qcow2-linux-e7655d2b25466c534ed1f539367dae595bb0bd20.zip | |
Merge tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- error handling fixup for one of the new ioctls from 1st pull
- fix for device-replace that incorrectly uses inode pages and can mess
up compressed extents in some cases
- fiemap fix for reporting incorrect number of extents
- vm_fault_t type conversion
* tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: scrub: Don't use inode pages for device replace
btrfs: change return type of btrfs_page_mkwrite to vm_fault_t
Btrfs: fiemap: pass correct bytenr when fm_extent_count is zero
btrfs: Check error of btrfs_iget in btrfs_search_path_in_tree_user
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 51fc015c7d2c..cce6087d6880 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4542,7 +4542,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, offset_in_extent = em_start - em->start; em_end = extent_map_end(em); em_len = em_end - em_start; - disko = 0; + disko = em->block_start + offset_in_extent; flags = 0; /* @@ -4565,8 +4565,6 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 bytenr = em->block_start - (em->start - em->orig_start); - disko = em->block_start + offset_in_extent; - /* * As btrfs supports shared space, this information * can be exported to userspace tools via |