[5.19,0/3] 5.19 reverts

Message

Pavel Begunkov June 14, 2022, 4:51 p.m. UTC

We've got a couple of nops debugging features, which don't belong to
upstream, and IORING_CLOSE_FD_AND_FILE_SLOT nobody knows how to use
reliably and with a couple of unsolved problems.

All came in 5.19, let's revert them.

Pavel Begunkov (3):
  Revert "io_uring: support CQE32 for nop operation"
  Revert "io_uring: add buffer selection support to IORING_OP_NOP"
  io_uring: remove IORING_CLOSE_FD_AND_FILE_SLOT

 fs/io_uring.c                 | 46 +++--------------------------------
 include/uapi/linux/io_uring.h |  6 -----
 2 files changed, 4 insertions(+), 48 deletions(-)

Comments

Jens Axboe June 14, 2022, 5:02 p.m. UTC | #1

On Tue, 14 Jun 2022 17:51:15 +0100, Pavel Begunkov wrote:
> We've got a couple of nops debugging features, which don't belong to
> upstream, and IORING_CLOSE_FD_AND_FILE_SLOT nobody knows how to use
> reliably and with a couple of unsolved problems.
> 
> All came in 5.19, let's revert them.
> 
> Pavel Begunkov (3):
>   Revert "io_uring: support CQE32 for nop operation"
>   Revert "io_uring: add buffer selection support to IORING_OP_NOP"
>   io_uring: remove IORING_CLOSE_FD_AND_FILE_SLOT
> 
> [...]

Applied, thanks!

[1/3] Revert "io_uring: support CQE32 for nop operation"
      commit: 8899ce4b2f7364a90e3b9cf332dfd9993c61f46c
[2/3] Revert "io_uring: add buffer selection support to IORING_OP_NOP"
      commit: aa165d6d2bb55f8b1bb5047fd634311681316fa2
[3/3] io_uring: remove IORING_CLOSE_FD_AND_FILE_SLOT
      commit: d884b6498d2f022098502e106d5a45ab635f2e9a

Best regards,