diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-03 14:26:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-03 14:26:47 -0700
commitd83e98f9d8c88cbae1b05fa5751bddfcf0e222b2 (patch)
parent8e29be3468d4565dd95fbb098df0d7a79ee60d71 (diff)
parente82ad4853948382d37ac512b27a3e70b6f01c103 (diff)
Merge tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block
POull io_uring fix from Jens Axboe: "Just fixing a silly braino in a previous patch, where we'd end up failing to compile if CONFIG_BLOCK isn't enabled. Not that a lot of people do that, but kernel bot spotted it and it's probably prudent to just flush this out now before -rc6. Sorry about that, none of my test compile configs have !CONFIG_BLOCK" * tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block: io_uring: fix !CONFIG_BLOCK compilation failure
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 8be542050648..65a17d560a73 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2479,6 +2479,11 @@ static bool io_rw_should_reissue(struct io_kiocb *req)
return false;
return true;
+static bool io_rw_should_reissue(struct io_kiocb *req)
+ return false;
static bool io_rw_reissue(struct io_kiocb *req)

Privacy Policy