Skip to content

Commit

Permalink
Merge tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Apr 3, 2021
2 parents 8e29be3 + e82ad48 commit d83e98f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d83e98f

Please sign in to comment.