Tom Seewald fce1affe4e ocfs2: fix build failure when TCP/IP is disabled
After commit 12abc5ee7873 ("tcp: add tcp_sock_set_nodelay") and commit
c488aeadcbd0 ("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: 12abc5ee7873 ("tcp: add tcp_sock_set_nodelay")
Fixes: c488aeadcbd0 ("tcp: add tcp_sock_set_user_timeout")
Signed-off-by: Tom Seewald <tseewald@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Link: http://lkml.kernel.org/r/20200606190827.23954-1-tseewald@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-06-11 18:17:47 -07:00
..
2020-03-27 09:29:56 +00:00
2020-06-09 18:17:14 +01:00
2020-06-01 12:10:17 -07:00
2020-06-05 16:43:16 -07:00
2020-06-02 20:16:55 -07:00
2020-06-09 11:24:59 -07:00
2020-06-09 10:04:47 -07:00
2020-06-09 11:28:59 -07:00
2020-06-09 15:48:24 -07:00
2020-06-08 12:47:09 -07:00
2020-06-02 15:29:19 -07:00
2020-06-02 15:29:19 -07:00
2020-06-02 20:11:35 -07:00
2020-06-11 12:22:41 -07:00
2020-06-11 10:33:13 -07:00
\n
2020-06-04 13:51:54 -07:00
2020-06-09 15:40:50 -07:00
\n
2020-06-04 13:53:10 -07:00
2020-06-05 14:05:57 -07:00
2020-06-02 15:29:19 -07:00
2020-06-11 10:48:12 -07:00
2020-06-04 13:50:13 -07:00
2020-06-02 15:37:03 -07:00
2020-06-02 19:59:25 -07:00
2020-05-14 16:44:25 +02:00
2020-02-07 14:48:35 -05:00
2020-06-05 16:26:36 -07:00
2020-06-10 19:14:18 -07:00
2020-06-11 10:33:13 -07:00
2020-03-05 21:00:40 -05:00
2020-05-14 16:44:24 +02:00
2020-06-02 19:45:12 -07:00
2020-06-09 15:40:50 -07:00
2020-05-14 16:44:24 +02:00
2020-04-09 15:33:09 -04:00