diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:55:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 22:55:52 -0700 |
| commit | bc243704fb3c97f3631994bbe543782a09482afb (patch) | |
| tree | 97a194de092875232680d407988e1e04e71b8334 /fs/btrfs/compression.c | |
| parent | 0ffff118b16b1201801d002ff9fa2eecdb45c529 (diff) | |
| parent | c3cfb656307583ddfea45375c10183737593c195 (diff) | |
| download | linux-bc243704fb3c97f3631994bbe543782a09482afb.tar.gz linux-bc243704fb3c97f3631994bbe543782a09482afb.tar.bz2 linux-bc243704fb3c97f3631994bbe543782a09482afb.zip | |
Merge branch 'for-4.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"We've identified and fixed a silent corruption (introduced by code in
the first pull), a fixup after the blk_status_t merge and two fixes to
incremental send that Filipe has been hunting for some time"
* 'for-4.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix unexpected return value of bio_readpage_error
btrfs: btrfs_create_repair_bio never fails, skip error handling
btrfs: cloned bios must not be iterated by bio_for_each_segment_all
Btrfs: fix write corruption due to bio cloning on raid5/6
Btrfs: incremental send, fix invalid memory access
Btrfs: incremental send, fix invalid path for link commands
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 2c0b7b57fcd5..d2ef9ac2a630 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -152,6 +152,7 @@ csum_failed: * we have verified the checksum already, set page * checked so the end_io handlers know about it */ + ASSERT(!bio_flagged(bio, BIO_CLONED)); bio_for_each_segment_all(bvec, cb->orig_bio, i) SetPageChecked(bvec->bv_page); |