Commit 93f052cb authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: use right helpers for file assign locking 



We have io_ring_submit_[un]lock() functions helping us with conditional
->uring_lock locking, use them in io_file_get_fixed() instead of hand
coding.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/c9c9ff1e046f6eb68da0a251962a697f8a2275fa.1650311386.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a6d97a8a

fs/io_uring.c

+2 −4
Original line number Diff line number Diff line
@@ -7388,8 +7388,7 @@ static inline struct file *io_file_get_fixed(struct io_kiocb *req, int fd, 
	struct file *file = NULL;

	unsigned long file_ptr;



	if (issue_flags & IO_URING_F_UNLOCKED)

		mutex_lock(&ctx->uring_lock);

	io_ring_submit_lock(ctx, issue_flags);



	if (unlikely((unsigned int)fd >= ctx->nr_user_files))

		goto out;
@@ -7401,8 +7400,7 @@ static inline struct file *io_file_get_fixed(struct io_kiocb *req, int fd, 
	req->flags |= (file_ptr << REQ_F_SUPPORT_NOWAIT_BIT);

	io_req_set_rsrc_node(req, ctx, 0);

out:

	if (issue_flags & IO_URING_F_UNLOCKED)

		mutex_unlock(&ctx->uring_lock);

	io_ring_submit_unlock(ctx, issue_flags);

	return file;

}