diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-02 16:13:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-02 16:13:13 -0700 |
| commit | d93a0d43e3d0ba9e19387be4dae4a8d5b175a8d7 (patch) | |
| tree | e49badc7daf845034102081c934aa767652aee17 /drivers/block/null_blk/null_blk.h | |
| parent | Merge tag 'io_uring-5.12-2021-04-02' of git://git.kernel.dk/linux-block (diff) | |
| parent | block: remove the unused RQF_ALLOCED flag (diff) | |
| download | linux-dev-d93a0d43e3d0ba9e19387be4dae4a8d5b175a8d7.tar.xz linux-dev-d93a0d43e3d0ba9e19387be4dae4a8d5b175a8d7.zip | |
Merge tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Remove comment that never came to fruition in 22 years of development
(Christoph)
- Remove unused request flag (Christoph)
- Fix for null_blk fake timeout handling (Damien)
- Fix for IOCB_NOWAIT being ignored for O_DIRECT on raw bdevs (Pavel)
- Error propagation fix for multiple split bios (Yufen)
* tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block:
block: remove the unused RQF_ALLOCED flag
block: update a few comments in uapi/linux/blkpg.h
block: don't ignore REQ_NOWAIT for direct IO
null_blk: fix command timeout completion handling
block: only update parent bi_status when bio fail
Diffstat (limited to 'drivers/block/null_blk/null_blk.h')
| -rw-r--r-- | drivers/block/null_blk/null_blk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/null_blk/null_blk.h b/drivers/block/null_blk/null_blk.h index 83504f3cc9d6..4876d5adb12d 100644 --- a/drivers/block/null_blk/null_blk.h +++ b/drivers/block/null_blk/null_blk.h @@ -22,6 +22,7 @@ struct nullb_cmd { blk_status_t error; struct nullb_queue *nq; struct hrtimer timer; + bool fake_timeout; }; struct nullb_queue { |