diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-01-09 20:28:19 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-01-09 20:28:19 -0800 |
| commit | 407da561244b9d51e6a794d6305ba38ec2c9d907 (patch) | |
| tree | a9b8e399f85eb14f9591fc654ae2372281ffa729 /include/linux/bio.h | |
| parent | 144ff5e03d745a299a9aabe2a597da843cf1c430 (diff) | |
| parent | b7bfaa761d760e72a969d116517eaa12e404c262 (diff) | |
Merge tag 'v6.2-rc3' into next
Merge with mainline to bring in timer_shutdown_sync() API.
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 2c5806997bbf..c1da63f6c808 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -784,8 +784,7 @@ static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb) static inline void bio_clear_polled(struct bio *bio) { - /* can't support alloc cache if we turn off polling */ - bio->bi_opf &= ~(REQ_POLLED | REQ_ALLOC_CACHE); + bio->bi_opf &= ~REQ_POLLED; } struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev, |