diff options
| author | Linus Torvalds | 2018-06-26 17:41:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-26 17:41:54 +0200 |
| commit | 84bfed40fc25dd052620398fdcc19d8c77f02270 (patch) | |
| tree | e0a8c7df159edfdc745b91de2c8158f939c31e03 /fs/btrfs/extent_io.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Btrfs: fix return value on rename exchange failure (diff) | |
| download | kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.tar.gz kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.tar.xz kernel-qcow2-linux-84bfed40fc25dd052620398fdcc19d8c77f02270.zip | |
Merge tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two regression fixes and an incorrect error value propagation fix from
'rename exchange'"
* tag 'for-4.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix return value on rename exchange failure
btrfs: fix invalid-free in btrfs_extent_same
Btrfs: fix physical offset reported by fiemap for inline extents
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index cce6087d6880..e55843f536bc 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4542,8 +4542,11 @@ 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 = em->block_start + offset_in_extent; flags = 0; + if (em->block_start < EXTENT_MAP_LAST_BYTE) + disko = em->block_start + offset_in_extent; + else + disko = 0; /* * bump off for our next call to get_extent |