Commit a2100672 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: clean up io_close

Don't abuse labels for plain and straightworward code.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8755d97a
...@@ -3030,16 +3030,7 @@ static int io_close(struct io_kiocb *req, struct io_kiocb **nxt, ...@@ -3030,16 +3030,7 @@ static int io_close(struct io_kiocb *req, struct io_kiocb **nxt,
return ret; return ret;
/* if the file has a flush method, be safe and punt to async */ /* if the file has a flush method, be safe and punt to async */
if (req->close.put_file->f_op->flush && !io_wq_current_is_worker()) if (req->close.put_file->f_op->flush && force_nonblock) {
goto eagain;
/*
* No ->flush(), safely close from here and just punt the
* fput() to async context.
*/
__io_close_finish(req, nxt);
return 0;
eagain:
req->work.func = io_close_finish; req->work.func = io_close_finish;
/* /*
* Do manual async queue here to avoid grabbing files - we don't * Do manual async queue here to avoid grabbing files - we don't
...@@ -3048,6 +3039,14 @@ static int io_close(struct io_kiocb *req, struct io_kiocb **nxt, ...@@ -3048,6 +3039,14 @@ static int io_close(struct io_kiocb *req, struct io_kiocb **nxt,
*/ */
io_queue_async_work(req); io_queue_async_work(req);
return 0; return 0;
}
/*
* No ->flush(), safely close from here and just punt the
* fput() to async context.
*/
__io_close_finish(req, nxt);
return 0;
} }
static int io_prep_sfr(struct io_kiocb *req, const struct io_uring_sqe *sqe) static int io_prep_sfr(struct io_kiocb *req, const struct io_uring_sqe *sqe)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment