diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-21 13:24:12 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-21 13:24:12 -1000 |
| commit | 45af60e7ced07ae3def41368c3d260dbf496fbce (patch) | |
| tree | d455d37878ead6306098ad15d3080976c9db3ce9 /fs/btrfs/extent_io.c | |
| parent | Merge tag '5.13-rc3-smb3' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | btrfs: zoned: fix parallel compressed writes (diff) | |
| download | linux-dev-45af60e7ced07ae3def41368c3d260dbf496fbce.tar.xz linux-dev-45af60e7ced07ae3def41368c3d260dbf496fbce.zip | |
Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"A few more fixes:
- fix unaligned compressed writes in zoned mode
- fix false positive lockdep warning when cloning inline extent
- remove wrong BUG_ON in tree-log error handling"
* tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: zoned: fix parallel compressed writes
btrfs: zoned: pass start block to btrfs_use_zone_append
btrfs: do not BUG_ON in link_to_fixup_dir
btrfs: release path before starting transaction when cloning inline extent
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 83b9c64ba76e..dee2dafbc872 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3753,7 +3753,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, /* Note that em_end from extent_map_end() is exclusive */ iosize = min(em_end, end + 1) - cur; - if (btrfs_use_zone_append(inode, em)) + if (btrfs_use_zone_append(inode, em->block_start)) opf = REQ_OP_ZONE_APPEND; free_extent_map(em); |