Skip to content

Commit d7385ba

Browse files
jandryukdavem330
authored andcommitted
9p: Remove INET dependency
9pfs can run over assorted transports, so it doesn't have an INET dependency. Drop it and remove the includes of linux/inet.h. NET_9P_FD/trans_fd.o builds without INET or UNIX and is usable over plain file descriptors. However, tcp and unix functionality is still built and would generate runtime failures if used. Add imply INET and UNIX to NET_9P_FD, so functionality is enabled by default but can still be explicitly disabled. This allows configuring 9pfs over Xen with INET and UNIX disabled. Signed-off-by: Jason Andryuk <jandryuk@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 042334a commit d7385ba

9 files changed

Lines changed: 3 additions & 8 deletions

File tree

fs/9p/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config 9P_FS
33
tristate "Plan 9 Resource Sharing Support (9P2000)"
4-
depends on INET && NET_9P
4+
depends on NET_9P
55
select NETFS_SUPPORT
66
help
77
If you say Y here, you will get experimental support for

fs/9p/vfs_addr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/file.h>
1313
#include <linux/stat.h>
1414
#include <linux/string.h>
15-
#include <linux/inet.h>
1615
#include <linux/pagemap.h>
1716
#include <linux/sched.h>
1817
#include <linux/swap.h>

fs/9p/vfs_dentry.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/pagemap.h>
1414
#include <linux/stat.h>
1515
#include <linux/string.h>
16-
#include <linux/inet.h>
1716
#include <linux/namei.h>
1817
#include <linux/sched.h>
1918
#include <linux/slab.h>

fs/9p/vfs_dir.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/stat.h>
1414
#include <linux/string.h>
1515
#include <linux/sched.h>
16-
#include <linux/inet.h>
1716
#include <linux/slab.h>
1817
#include <linux/uio.h>
1918
#include <linux/fscache.h>

fs/9p/vfs_file.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/file.h>
1515
#include <linux/stat.h>
1616
#include <linux/string.h>
17-
#include <linux/inet.h>
1817
#include <linux/list.h>
1918
#include <linux/pagemap.h>
2019
#include <linux/utsname.h>

fs/9p/vfs_inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/pagemap.h>
1616
#include <linux/stat.h>
1717
#include <linux/string.h>
18-
#include <linux/inet.h>
1918
#include <linux/namei.h>
2019
#include <linux/sched.h>
2120
#include <linux/slab.h>

fs/9p/vfs_inode_dotl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/pagemap.h>
1414
#include <linux/stat.h>
1515
#include <linux/string.h>
16-
#include <linux/inet.h>
1716
#include <linux/namei.h>
1817
#include <linux/sched.h>
1918
#include <linux/slab.h>

fs/9p/vfs_super.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <linux/file.h>
1313
#include <linux/stat.h>
1414
#include <linux/string.h>
15-
#include <linux/inet.h>
1615
#include <linux/pagemap.h>
1716
#include <linux/mount.h>
1817
#include <linux/sched.h>

net/9p/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if NET_9P
1717

1818
config NET_9P_FD
1919
default NET_9P
20+
imply INET
21+
imply UNIX
2022
tristate "9P FD Transport"
2123
help
2224
This builds support for transports over TCP, Unix sockets and

0 commit comments

Comments
 (0)