diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 14:26:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 14:26:47 -0700 |
| commit | d83e98f9d8c88cbae1b05fa5751bddfcf0e222b2 (patch) | |
| tree | 002c25e5248a56e6f3a780c5641c3a86146858f8 | |
| parent | 8e29be3468d4565dd95fbb098df0d7a79ee60d71 (diff) | |
| parent | e82ad4853948382d37ac512b27a3e70b6f01c103 (diff) | |
| download | linux-d83e98f9d8c88cbae1b05fa5751bddfcf0e222b2.tar.bz2 | |
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
| -rw-r--r-- | fs/io_uring.c | 5 |
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; } +#else +static bool io_rw_should_reissue(struct io_kiocb *req) +{ + return false; +} #endif static bool io_rw_reissue(struct io_kiocb *req) |