af_unix: Remove CONFIG_UNIX_SCM.
authorKuniyuki Iwashima <kuniyu@amazon.com>
Mon, 29 Jan 2024 19:04:35 +0000 (11:04 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Feb 2024 00:41:16 +0000 (16:41 -0800)
commit99a7a5b9943ea2d05fb0dee38e4ae2290477ed83
tree6f47f81313dea6d075f8a90be3a9e71b55c9601d
parent11498715f266a3fb4caabba9dd575636cbcaa8f1
af_unix: Remove CONFIG_UNIX_SCM.

Originally, the code related to garbage collection was all in garbage.c.

Commit f4e65870e5ce ("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 97154bcf4d1b ("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

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>
include/net/af_unix.h
net/Makefile
net/unix/Kconfig
net/unix/Makefile
net/unix/af_unix.c
net/unix/garbage.c
net/unix/scm.c [deleted file]
net/unix/scm.h [deleted file]