forked from luck/tmp_suning_uos_patched
fce1affe4e
After commit12abc5ee78("tcp: add tcp_sock_set_nodelay") and commitc488aeadcb("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:12abc5ee78("tcp: add tcp_sock_set_nodelay") Fixes:c488aeadcb("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>
78 lines
2.5 KiB
Plaintext
78 lines
2.5 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
config OCFS2_FS
|
|
tristate "OCFS2 file system support"
|
|
depends on INET && SYSFS && CONFIGFS_FS
|
|
select JBD2
|
|
select CRC32
|
|
select QUOTA
|
|
select QUOTA_TREE
|
|
select FS_POSIX_ACL
|
|
help
|
|
OCFS2 is a general purpose extent based shared disk cluster file
|
|
system with many similarities to ext3. It supports 64 bit inode
|
|
numbers, and has automatically extending metadata groups which may
|
|
also make it attractive for non-clustered use.
|
|
|
|
You'll want to install the ocfs2-tools package in order to at least
|
|
get "mount.ocfs2".
|
|
|
|
Project web page: http://oss.oracle.com/projects/ocfs2
|
|
Tools web page: http://oss.oracle.com/projects/ocfs2-tools
|
|
OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
|
|
|
|
For more information on OCFS2, see the file
|
|
<file:Documentation/filesystems/ocfs2.rst>.
|
|
|
|
config OCFS2_FS_O2CB
|
|
tristate "O2CB Kernelspace Clustering"
|
|
depends on OCFS2_FS
|
|
default y
|
|
help
|
|
OCFS2 includes a simple kernelspace clustering package, the OCFS2
|
|
Cluster Base. It only requires a very small userspace component
|
|
to configure it. This comes with the standard ocfs2-tools package.
|
|
O2CB is limited to maintaining a cluster for OCFS2 file systems.
|
|
It cannot manage any other cluster applications.
|
|
|
|
It is always safe to say Y here, as the clustering method is
|
|
run-time selectable.
|
|
|
|
config OCFS2_FS_USERSPACE_CLUSTER
|
|
tristate "OCFS2 Userspace Clustering"
|
|
depends on OCFS2_FS && DLM
|
|
default y
|
|
help
|
|
This option will allow OCFS2 to use userspace clustering services
|
|
in conjunction with the DLM in fs/dlm. If you are using a
|
|
userspace cluster manager, say Y here.
|
|
|
|
It is safe to say Y, as the clustering method is run-time
|
|
selectable.
|
|
|
|
config OCFS2_FS_STATS
|
|
bool "OCFS2 statistics"
|
|
depends on OCFS2_FS && DEBUG_FS
|
|
default y
|
|
help
|
|
This option allows some fs statistics to be captured. Enabling
|
|
this option may increase the memory consumption.
|
|
|
|
config OCFS2_DEBUG_MASKLOG
|
|
bool "OCFS2 logging support"
|
|
depends on OCFS2_FS
|
|
default y
|
|
help
|
|
The ocfs2 filesystem has an extensive logging system. The system
|
|
allows selection of events to log via files in /sys/o2cb/logmask/.
|
|
This option will enlarge your kernel, but it allows debugging of
|
|
ocfs2 filesystem issues.
|
|
|
|
config OCFS2_DEBUG_FS
|
|
bool "OCFS2 expensive checks"
|
|
depends on OCFS2_FS
|
|
default n
|
|
help
|
|
This option will enable expensive consistency checks. Enable
|
|
this option for debugging only as it is likely to decrease
|
|
performance of the filesystem.
|