UPSTREAM: af_unix: Remove CONFIG_UNIX_SCM.
commit 99a7a5b9 upstream. Originally, the code related to garbage collection was all in garbage.c. Commit f4e65870 ("net: split out functions related to registering inflight socket files") moved some functions to scm.c for io_uring and added CONFIG_UNIX_SCM just in case AF_UNIX was built as module. However, since commit 97154bcf ("af_unix: Kconfig: make CONFIG_UNIX bool"), AF_UNIX is no longer built separately. Also, io_uring does not support SCM_RIGHTS now. Let's move the functions back to garbage.c Bug: 404256079 Signed-off-by:Kuniyuki Iwashima <kuniyu@amazon.com> Acked-by:
Jens Axboe <axboe@kernel.dk> Link: https://lore.kernel.org/r/20240129190435.57228-4-kuniyu@amazon.com Signed-off-by:
Jakub Kicinski <kuba@kernel.org> Signed-off-by:
Lee Jones <lee@kernel.org> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 8eb55b66) Signed-off-by:
Lee Jones <joneslee@google.com> Change-Id: I03d22aa94dca45db9d09e45bf97d8da36502e2a7
Loading
Please sign in to comment