diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 14:43:03 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 14:43:03 -0700 |
| commit | 79548b7984e4c606c6caaad72a0864a83855ebc9 (patch) | |
| tree | 05e1be823acbae8bbcd155a706eb9e4f84eee047 /io_uring/rsrc.c | |
| parent | da617cd8d90608582eb8d0b58026f31f1a9bfb1d (diff) | |
| parent | b2bc47e9b2011a183f9d3d3454a294a938082fb9 (diff) | |
| download | linux-79548b7984e4c606c6caaad72a0864a83855ebc9.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_ppe.c
3fbe4d8c0e53 ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
924531326e2d ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'io_uring/rsrc.c')
| -rw-r--r-- | io_uring/rsrc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index ad10bae33b23f..a5ed0ee7c160d 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -794,6 +794,7 @@ void __io_sqe_files_unregister(struct io_ring_ctx *ctx) } #endif io_free_file_tables(&ctx->file_table); + io_file_table_set_alloc_range(ctx, 0, 0); io_rsrc_data_free(ctx->file_data); ctx->file_data = NULL; ctx->nr_user_files = 0; |