Skip to content

Commit fce1aff

Browse files
tom-seewaldtorvalds
authored andcommitted
ocfs2: fix build failure when TCP/IP is disabled
After commit 12abc5e ("tcp: add tcp_sock_set_nodelay") and commit c488aea ("tcp: add tcp_sock_set_user_timeout"), building the kernel with OCFS2_FS=y but without INET=y causes it to fail with: ld: fs/ocfs2/cluster/tcp.o: in function `o2net_accept_many': tcp.c:(.text+0x21b1): undefined reference to `tcp_sock_set_nodelay' ld: tcp.c:(.text+0x21c1): undefined reference to `tcp_sock_set_user_timeout' ld: fs/ocfs2/cluster/tcp.o: in function `o2net_start_connect': tcp.c:(.text+0x2633): undefined reference to `tcp_sock_set_nodelay' ld: tcp.c:(.text+0x2643): undefined reference to `tcp_sock_set_user_timeout' This is due to tcp_sock_set_nodelay() and tcp_sock_set_user_timeout() being declared in linux/tcp.h and defined in net/ipv4/tcp.c, which depend on TCP/IP being enabled. To fix this, make OCFS2_FS depend on INET=y which already requires NET=y. Fixes: 12abc5e ("tcp: add tcp_sock_set_nodelay") Fixes: c488aea ("tcp: add tcp_sock_set_user_timeout") Signed-off-by: Tom Seewald <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Joseph Qi <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Cc: Sagi Grimberg <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: David S. Miller <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Gang He <[email protected]> Cc: Jun Piao <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 03151c6 commit fce1aff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ocfs2/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 OCFS2_FS
33
tristate "OCFS2 file system support"
4-
depends on NET && SYSFS && CONFIGFS_FS
4+
depends on INET && SYSFS && CONFIGFS_FS
55
select JBD2
66
select CRC32
77
select QUOTA

0 commit comments

Comments
 (0)