Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch io_msg_ring() to CLASS(fd)

Browse Source 
Use CLASS(fd) to get the file for sync message ring requests, rather
than open-code the file retrieval dance.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/20241115034902.GP3387508@ZenIV
[axboe: make a more coherent commit message]
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Al Viro 2024-11-15 03:49:02 +00:00 committed by Jens Axboe
parent b9d69371e8
commit 56cec28dc4
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
io_uring/msg_ring.c
View File

@ -333,7 +333,6 @@ done:
int io_uring_sync_msg_ring(struct io_uring_sqe *sqe)
{
struct io_msg io_msg = { };
struct fd f;
int ret;
ret = __io_msg_ring_prep(&io_msg, sqe);
@ -347,16 +346,13 @@ int io_uring_sync_msg_ring(struct io_uring_sqe *sqe)
if (io_msg.cmd != IORING_MSG_DATA)
return -EINVAL;
ret = -EBADF;
f = fdget(sqe->fd);
if (fd_file(f)) {
ret = -EBADFD;
if (io_is_uring_fops(fd_file(f)))
ret = __io_msg_ring_data(fd_file(f)->private_data,
&io_msg, IO_URING_F_UNLOCKED);
fdput(f);
}
return ret;
CLASS(fd, f)(sqe->fd);
if (fd_empty(f))
return -EBADF;
if (!io_is_uring_fops(fd_file(f)))
return -EBADFD;
return __io_msg_ring_data(fd_file(f)->private_data,
&io_msg, IO_URING_F_UNLOCKED);
}
void io_msg_cache_free(const void *entry)