diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 10:21:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-03 10:21:43 -0700 |
commit | 72fbbc3d0e3e3117c29a73d0b4d928dc00ed99ce (patch) | |
tree | 7b786dde386ed70c3930de6356e6fd406f2db36e /include | |
parent | 34845d92bca527b5c2cf8b2293b71b9c746c79ca (diff) | |
parent | e2e530867245d051dc7800b0d07193b3e581f5b9 (diff) | |
download | linux-72fbbc3d0e3e3117c29a73d0b4d928dc00ed99ce.tar.bz2 |
Merge tag 'for-5.19/block-exec-2022-06-02' of git://git.kernel.dk/linux-block
Pull block request execute cleanups from Jens Axboe:
"This change was advertised in the initial core block pull request, but
didn't actually make that branch as we deferred it to a post-merge
pull request to avoid a bunch of cross branch issues.
This series cleans up the block execute path quite nicely"
* tag 'for-5.19/block-exec-2022-06-02' of git://git.kernel.dk/linux-block:
blk-mq: remove the done argument to blk_execute_rq_nowait
blk-mq: avoid a mess of casts for blk_end_sync_rq
blk-mq: remove __blk_execute_rq_nowait
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/blk-mq.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 9f07061418db..e2d9daf7e8dd 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -969,8 +969,7 @@ int blk_rq_unmap_user(struct bio *); int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t); int blk_rq_append_bio(struct request *rq, struct bio *bio); -void blk_execute_rq_nowait(struct request *rq, bool at_head, - rq_end_io_fn *end_io); +void blk_execute_rq_nowait(struct request *rq, bool at_head); blk_status_t blk_execute_rq(struct request *rq, bool at_head); struct req_iterator { |