diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-01-29 22:04:35 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-01 03:41:16 +0300 |
| commit | 99a7a5b9943ea2d05fb0dee38e4ae2290477ed83 (patch) | |
| tree | 6f47f81313dea6d075f8a90be3a9e71b55c9601d /net/unix/scm.h | |
| parent | 11498715f266a3fb4caabba9dd575636cbcaa8f1 (diff) | |
| download | linux-99a7a5b9943ea2d05fb0dee38e4ae2290477ed83.tar.xz | |
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>
Diffstat (limited to 'net/unix/scm.h')
| -rw-r--r-- | net/unix/scm.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/unix/scm.h b/net/unix/scm.h deleted file mode 100644 index 5a255a477f16..000000000000 --- a/net/unix/scm.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef NET_UNIX_SCM_H -#define NET_UNIX_SCM_H - -extern struct list_head gc_inflight_list; -extern spinlock_t unix_gc_lock; - -int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb); -void unix_detach_fds(struct scm_cookie *scm, struct sk_buff *skb); - -#endif |