Commit 915cd30c authored by David Howells's avatar David Howells
Browse files

netfs, fscache: Combine fscache with netfs 



Now that the fscache code is moved to be colocated with the netfslib code
so that they combined into one module, do the combining.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
cc: Christian Brauner <christian@brauner.io>
cc: linux-fsdevel@vger.kernel.org
cc: linux-cachefs@redhat.com
cc: linux-nfs@vger.kernel.org,
cc: linux-erofs@lists.ozlabs.org
parent 47757ea8

arch/arm/configs/mxs_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ CONFIG_PWM_MXS=y 
CONFIG_NVMEM_MXS_OCOTP=y

CONFIG_EXT4_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_FSCACHE=m

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=m

CONFIG_VFAT_FS=y

arch/csky/configs/defconfig

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ CONFIG_GENERIC_PHY=y 
CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_QUOTA=y

CONFIG_FSCACHE=m

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=m

CONFIG_MSDOS_FS=y

arch/mips/configs/ip27_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_FUSE_FS=m

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=m

CONFIG_PROC_KCORE=y

arch/mips/configs/lemote2f_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ CONFIG_BTRFS_FS=m 
CONFIG_QUOTA=y

CONFIG_QFMT_V2=m

CONFIG_AUTOFS_FS=m

CONFIG_FSCACHE=m

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

arch/mips/configs/loongson3_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS_FS=y

CONFIG_FUSE_FS=m

CONFIG_VIRTIO_FS=m

CONFIG_FSCACHE=m

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_MSDOS_FS=m