mirror of
https://github.com/opnsense/src.git
synced 2026-06-09 08:43:19 -04:00
Disconnect non-MPSAFE XFS from the build in preparation for dropping
GIANT from VFS. This is not targeted for MFC.
This commit is contained in:
Attilio Rao
parent
55793cdccf
commit
4b0bdbfd9b
8 changed files with 1 additions and 154 deletions
|
|
@ -100,8 +100,6 @@ nfs alfred Will be happy to review code, but not mandatory.
|
|||
rpc.lockd alfred Will be happy to review code, but not mandatory.
|
||||
truss alfred Will be happy to review code, but not mandatory.
|
||||
rpc alfred Pre-commit review requested.
|
||||
xfs kan@FreeBSD.org,rodrigc@FreeBSD.org,cattelan@xfs.org
|
||||
Pre-commit review preferred.
|
||||
pkg_install portmgr Pre-commit review or approval from portmgr@ requested.
|
||||
linux emul emulation Please discuss changes here.
|
||||
bs{diff,patch} cperciva Pre-commit review requested.
|
||||
|
|
|
|||
|
|
@ -68,8 +68,7 @@ MAN= acct.5 \
|
|||
stab.5 \
|
||||
style.Makefile.5 \
|
||||
sysctl.conf.5 \
|
||||
tmpfs.5 \
|
||||
xfs.5
|
||||
tmpfs.5
|
||||
|
||||
MLINKS= dir.5 dirent.5
|
||||
MLINKS+=fs.5 inode.5
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@ nullfs_load="NO" # Null filesystem
|
|||
procfs_load="NO" # Process filesystem
|
||||
reiserfs_load="NO" # ReiserFS
|
||||
unionfs_load="NO" # Union filesystem
|
||||
xfs_load="NO" # XFS
|
||||
zfs_load="NO" # ZFS
|
||||
|
||||
# Related stuff
|
||||
|
|
|
|||
|
|
@ -1106,12 +1106,6 @@ options EXT2FS
|
|||
#
|
||||
options REISERFS
|
||||
|
||||
#
|
||||
# Add support for the SGI XFS filesystem. Currently,
|
||||
# this is limited to read-only access.
|
||||
#
|
||||
options XFS
|
||||
|
||||
# Use real implementations of the aio_* system calls. There are numerous
|
||||
# stability and security issues in the current aio code that make it
|
||||
# unsuitable for inclusion on machines with untrusted local users.
|
||||
|
|
|
|||
136
sys/conf/files
136
sys/conf/files
|
|
@ -3632,142 +3632,6 @@ xdr/xdr_mbuf.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
|
|||
xdr/xdr_mem.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
|
||||
xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
|
||||
xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
|
||||
#
|
||||
gnu/fs/xfs/xfs_alloc.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \
|
||||
warning "kernel contains GPL contaminated xfs filesystem"
|
||||
gnu/fs/xfs/xfs_alloc_btree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_bit.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_bmap.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_bmap_btree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_btree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_buf_item.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_da_btree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_block.c optional xfs \
|
||||
compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_data.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_node.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_sf.c optional xfs \
|
||||
compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir2_trace.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dir_leaf.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_error.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_extfree_item.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_fsops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_ialloc.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_ialloc_btree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_inode.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_inode_item.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_iocore.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_itable.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dfrag.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_log.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_log_recover.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_mount.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_rename.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans_ail.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans_buf.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans_extfree.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans_inode.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_trans_item.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_utils.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_vfsops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_vnodeops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_rw.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_attr_leaf.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_attr.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_dmops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_qmops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_iget.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_mountops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_vnops.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_frw.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_buf.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_globals.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_dmistubs.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_super.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_stats.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_vfs.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_vnode.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_sysctl.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_fs_subr.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/xfs_ioctl.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/support/debug.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/support/ktrace.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/support/mrlock.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/support/uuid.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/FreeBSD/support/kmem.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_iomap.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
gnu/fs/xfs/xfs_behavior.c optional xfs \
|
||||
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
|
||||
|
||||
xen/gnttab.c optional xen | xenhvm
|
||||
xen/features.c optional xen | xenhvm
|
||||
|
|
|
|||
|
|
@ -73,9 +73,6 @@ INCLUDES+= -I$S/contrib/ngatm
|
|||
# ... and the same for twa
|
||||
INCLUDES+= -I$S/dev/twa
|
||||
|
||||
# ... and the same for XFS
|
||||
INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
|
||||
|
||||
# ... and the same for cxgb and cxgbe
|
||||
INCLUDES+= -I$S/dev/cxgb -I$S/dev/cxgbe
|
||||
|
||||
|
|
|
|||
|
|
@ -838,9 +838,6 @@ HWPMC_MIPS_BACKTRACE opt_hwpmc_hooks.h
|
|||
# XBOX options for FreeBSD/i386, but some files are MI
|
||||
XBOX opt_xbox.h
|
||||
|
||||
# XFS
|
||||
XFS
|
||||
|
||||
ZFS opt_dontuse.h
|
||||
|
||||
# Interrupt filtering
|
||||
|
|
|
|||
|
|
@ -360,7 +360,6 @@ SUBDIR= \
|
|||
${_wpifw} \
|
||||
${_x86bios} \
|
||||
${_xe} \
|
||||
xfs \
|
||||
xl \
|
||||
${_zfs} \
|
||||
zlib \
|
||||
|
|
|
|||
Loading…
Reference in a new issue