On 5/8/20 9:29 AM, Hillf Danton wrote:

Dunno if what's missing makes grumpy.

--- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3439,6 +3439,11 @@ static void io_close_finish(struct io_wq static int io_close(struct io_kiocb *req, bool force_nonblock) { int ret;

• struct fd f;
• f = fdget(req->close.fd);
• if (!f.file)

• return -EBADF;
  

req->close.put_file = NULL; ret = __close_fd_get_file(req->close.fd, &req->close.put_file);

Can you expand? With the last patch posted, we don't do that fget/fdget at all. __close_fd_get_file() will error out if we don't have a file there. It does change the close error from -EBADF to -ENOENT, so maye we just need to improve that?

diff --git a/fs/io_uring.c b/fs/io_uring.c index 979d9f977409..9fd1257c8404 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -786,7 +786,6 @@ static const struct io_op_def io_op_defs[] = { .needs_fs = 1, }, [IORING_OP_CLOSE] = { - .needs_file = 1, .file_table = 1, }, [IORING_OP_FILES_UPDATE] = { @@ -3399,10 +3398,6 @@ static int io_close_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return -EBADF;

req->close.fd = READ_ONCE(sqe->fd); - if (req->file->f_op == &io_uring_fops || - req->close.fd == req->ctx->ring_fd) - return -EBADF; - return 0; }

@@ -3434,8 +3429,11 @@ static int io_close(struct io_kiocb *req, bool force_nonblock)

req->close.put_file = NULL; ret = __close_fd_get_file(req->close.fd, &req->close.put_file); - if (ret < 0) + if (ret < 0) { + if (ret == -ENOENT) + ret = -EBADF; return ret; + }

/* if the file has a flush method, be safe and punt to async */ if (req->close.put_file->f_op->flush && force_nonblock) {