diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-12 11:59:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-12 11:59:58 -0700 |
| commit | b4ade8eae3f4910a18d4f74cb4343c958290f3a0 (patch) | |
| tree | eff6e03782b8450f290e8e37c1bec1f6c23dc8a7 | |
| parent | 0585ca0a7a47eb66921042fb3fd1ad71a2c902ba (diff) | |
| parent | cd8a55005553a19719645fea00b1c7a7d16e9d09 (diff) | |
| download | linux-crypto-b4ade8eae3f4910a18d4f74cb4343c958290f3a0.tar.gz linux-crypto-b4ade8eae3f4910a18d4f74cb4343c958290f3a0.zip | |
Merge tag 'block-5.13-2021-06-12' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few fixes that should go into 5.13:
- Fix a regression deadlock introduced in this release between open
and remove of a bdev (Christoph)
- Fix an async_xor md regression in this release (Xiao)
- Fix bcache oversized read issue (Coly)"
* tag 'block-5.13-2021-06-12' of git://git.kernel.dk/linux-block:
block: loop: fix deadlock between open and remove
async_xor: check src_offs is not NULL before updating it
bcache: avoid oversized read request in cache missing code path
bcache: remove bcache device self-defined readahead
| -rw-r--r-- | crypto/async_tx/async_xor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 6cd7f702..d8a91521 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -233,7 +233,8 @@ async_xor_offs(struct page *dest, unsigned int offset, if (submit->flags & ASYNC_TX_XOR_DROP_DST) { src_cnt--; src_list++; - src_offs++; + if (src_offs) + src_offs++; } /* wait for any prerequisite operations */ |