Commit f9af583a authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

af_unix: Sort headers. 



This is a prep patch to make the following changes cleaner.

No functional change intended.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarJoe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250318034934.86708-2-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0d14c394

include/net/af_unix.h

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
#ifndef __LINUX_NET_AFUNIX_H

#define __LINUX_NET_AFUNIX_H



#include <linux/socket.h>

#include <linux/un.h>

#include <linux/mutex.h>

#include <linux/refcount.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <net/sock.h>



#if IS_ENABLED(CONFIG_UNIX)

net/unix/af_unix.c

+31 −31
Original line number Diff line number Diff line
@@ -77,46 +77,46 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/signal.h>

#include <linux/sched/signal.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/stat.h>

#include <linux/bpf-cgroup.h>

#include <linux/btf_ids.h>

#include <linux/dcache.h>

#include <linux/namei.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <linux/errno.h>

#include <linux/fcntl.h>

#include <linux/file.h>

#include <linux/filter.h>

#include <linux/termios.h>

#include <linux/sockios.h>

#include <linux/net.h>

#include <linux/in.h>

#include <linux/freezer.h>

#include <linux/fs.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/net_namespace.h>

#include <net/sock.h>

#include <net/tcp_states.h>

#include <net/af_unix.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <net/scm.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/net.h>

#include <linux/netdevice.h>

#include <linux/poll.h>

#include <linux/proc_fs.h>

#include <linux/rtnetlink.h>

#include <linux/mount.h>

#include <net/checksum.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/freezer.h>

#include <linux/file.h>

#include <linux/btf_ids.h>

#include <linux/bpf-cgroup.h>

#include <linux/stat.h>

#include <linux/string.h>

#include <linux/termios.h>

#include <linux/uaccess.h>

#include <linux/un.h>

#include <net/af_unix.h>

#include <net/checksum.h>

#include <net/net_namespace.h>

#include <net/scm.h>

#include <net/sock.h>

#include <net/tcp_states.h>



static atomic_long_t unix_nr_socks;

static struct hlist_head bsd_socket_buckets[UNIX_HASH_SIZE / 2];

net/unix/diag.c

+8 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/sock_diag.h>

#include <linux/unix_diag.h>

#include <linux/skbuff.h>



#include <linux/module.h>

#include <linux/skbuff.h>

#include <linux/sock_diag.h>

#include <linux/spinlock.h>

#include <linux/types.h>

#include <linux/uidgid.h>

#include <net/netlink.h>

#include <linux/unix_diag.h>

#include <net/af_unix.h>

#include <net/tcp_states.h>

#include <net/netlink.h>

#include <net/sock.h>

#include <net/tcp_states.h>



static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb)

{

net/unix/garbage.c

+8 −9
Original line number Diff line number Diff line
@@ -63,22 +63,21 @@ 
 *		wrt receive and holding up unrelated socket operations.

 */



#include <linux/file.h>

#include <linux/fs.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <linux/mutex.h>

#include <linux/net.h>

#include <linux/fs.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/file.h>

#include <linux/proc_fs.h>

#include <linux/mutex.h>

#include <linux/skbuff.h>

#include <linux/socket.h>

#include <linux/string.h>

#include <linux/un.h>

#include <linux/wait.h>



#include <net/sock.h>

#include <net/af_unix.h>

#include <net/scm.h>

#include <net/sock.h>

#include <net/tcp_states.h>



struct unix_sock *unix_get_socket(struct file *filp)

net/unix/sysctl_net_unix.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/sysctl.h>



#include <net/af_unix.h>



static struct ctl_table unix_table[] = {