Commit d83e98f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8e29be34 e82ad485

fs/io_uring.c

+5 −0
Original line number Diff line number Diff line
@@ -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)