diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 07:53:56 +0200 |
| commit | 50e177c5bfd9abc3828cb57e14e6169170f6764a (patch) | |
| tree | 180aafa376fb7a0a89c7d6812f640f8c46758bd5 /io_uring/rsrc.h | |
| parent | misc: microchip: pci1xxxx: Add power management functions - suspend & resume ... (diff) | |
| parent | Linux 6.0-rc4 (diff) | |
| download | linux-50e177c5bfd9abc3828cb57e14e6169170f6764a.tar.xz linux-50e177c5bfd9abc3828cb57e14e6169170f6764a.zip | |
Merge 6.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring/rsrc.h')
| -rw-r--r-- | io_uring/rsrc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index f3a9a177941f..9bce15665444 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -167,8 +167,8 @@ static inline u64 *io_get_tag_slot(struct io_rsrc_data *data, unsigned int idx) return &data->tags[table_idx][off]; } -int io_rsrc_update(struct io_kiocb *req, unsigned int issue_flags); -int io_rsrc_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); +int io_files_update(struct io_kiocb *req, unsigned int issue_flags); +int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); int __io_account_mem(struct user_struct *user, unsigned long nr_pages); |