@@ -84,36 +84,28 @@
#include <linux/fcntl.h>
#include <linux/file.h>
#include <linux/filter.h>
-#include <linux/freezer.h>
#include <linux/fs.h>
-#include <linux/in.h>
#include <linux/init.h>
#include <linux/kernel.h>
-#include <linux/module.h>
#include <linux/mount.h>
#include <linux/namei.h>
-#include <linux/netdevice.h>
#include <linux/poll.h>
#include <linux/proc_fs.h>
-#include <linux/rtnetlink.h>
#include <linux/sched/signal.h>
#include <linux/security.h>
#include <linux/seq_file.h>
-#include <linux/signal.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
#include <linux/socket.h>
-#include <linux/sockios.h>
#include <linux/splice.h>
-#include <linux/stat.h>
#include <linux/string.h>
-#include <linux/termios.h>
#include <linux/uaccess.h>
#include <net/af_unix.h>
-#include <net/checksum.h>
#include <net/net_namespace.h>
#include <net/scm.h>
#include <net/tcp_states.h>
+#include <uapi/linux/sockios.h>
+#include <uapi/linux/termios.h>
#include "af_unix.h"
@@ -1,13 +1,15 @@
// SPDX-License-Identifier: GPL-2.0-only
+#include <linux/dcache.h>
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/sock_diag.h>
#include <linux/types.h>
-#include <linux/unix_diag.h>
+#include <linux/user_namespace.h>
#include <net/af_unix.h>
#include <net/netlink.h>
#include <net/tcp_states.h>
+#include <uapi/linux/unix_diag.h>
#include "af_unix.h"
@@ -63,14 +63,11 @@
* wrt receive and holding up unrelated socket operations.
*/
-#include <linux/file.h>
#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/proc_fs.h>
+#include <linux/list.h>
#include <linux/skbuff.h>
#include <linux/socket.h>
-#include <linux/string.h>
+#include <linux/workqueue.h>
#include <net/af_unix.h>
#include <net/scm.h>
#include <net/tcp_states.h>
@@ -5,10 +5,11 @@
* Authors: Mike Shaver.
*/
-#include <linux/mm.h>
#include <linux/slab.h>
+#include <linux/string.h>
#include <linux/sysctl.h>
#include <net/af_unix.h>
+#include <net/net_namespace.h>
#include "af_unix.h"
net/unix/*.c include many unnecessary header files (rtnetlink.h, netdevice.h, etc). Let's clean them up. af_unix.c: +uapi/linux/sockios.h : Only exist under include/uapi +uapi/linux/termios.h : Only exist under include/uapi -linux/freezer.h : No longer use freezable_schedule_timeout() -linux/in.h : No ipv4_is_XXX() etc -linux/module.h : No longer support CONFIG_UNIX=m -linux/netdevice.h : No dev used -linux/rtnetlink.h : Not part of rtnetlink API -linux/signal.h : signal_pending() is defined in sched/signal.h -linux/stat.h : No struct stat used -net/checksum.h : CHECKSUM_UNNECESSARY is defined in skbuff.h diag.c: +linux/dcache.h : struct dentry in sk_diag_dump_vfs() +linux/user_namespace.h : struct user_namespace in sk_diag_dump_uid() +uapi/linux/unix_diag.h : Only exist under include/uapi/ garbage.c: +linux/list.h : struct unix_{vertex,edge}, etc +linux/workqueue.h : DECLARE_WORK(unix_gc_work, ...) -linux/file.h : No fget() etc -linux/kernel.h : No cond_resched() etc -linux/netdevice.h : No dev used -linux/proc_fs.h : No procfs provided -linux/string.h : No memcpy(), kmemdup(), etc sysctl_net_unix.c: +linux/string.h : kmemdup() +net/net_namespace.h : struct net, net_eq() -linux/mm.h : slab.h is enough Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> --- net/unix/af_unix.c | 12 ++---------- net/unix/diag.c | 4 +++- net/unix/garbage.c | 7 ++----- net/unix/sysctl_net_unix.c | 3 ++- 4 files changed, 9 insertions(+), 17 deletions(-)