summaryrefslogtreecommitdiff
path: root/fs/netfs/Makefile
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2023-11-20 18:55:18 +0300
committerDavid Howells <dhowells@redhat.com>2023-12-24 18:08:46 +0300
commit915cd30cdea8811cddd8f59e57dd9dd0a814b76c (patch)
tree69307721a0a976967278ca5b8753e6ad86623120 /fs/netfs/Makefile
parent47757ea83a545536cdd418fec84b7a970710e48b (diff)
downloadlinux-915cd30cdea8811cddd8f59e57dd9dd0a814b76c.tar.xz
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: David Howells <dhowells@redhat.com> Reviewed-by: Jeff 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
Diffstat (limited to 'fs/netfs/Makefile')
-rw-r--r--fs/netfs/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/netfs/Makefile b/fs/netfs/Makefile
index bbb2b824bd5e..b57162ef9cfb 100644
--- a/fs/netfs/Makefile
+++ b/fs/netfs/Makefile
@@ -1,17 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-fscache-y := \
- fscache_cache.o \
- fscache_cookie.o \
- fscache_io.o \
- fscache_main.o \
- fscache_volume.o
-
-fscache-$(CONFIG_PROC_FS) += fscache_proc.o
-fscache-$(CONFIG_FSCACHE_STATS) += fscache_stats.o
-
-obj-$(CONFIG_FSCACHE) := fscache.o
-
netfs-y := \
buffered_read.o \
io.o \
@@ -21,4 +9,16 @@ netfs-y := \
netfs-$(CONFIG_NETFS_STATS) += stats.o
+netfs-$(CONFIG_FSCACHE) += \
+ fscache_cache.o \
+ fscache_cookie.o \
+ fscache_io.o \
+ fscache_main.o \
+ fscache_volume.o
+
+ifeq ($(CONFIG_PROC_FS),y)
+netfs-$(CONFIG_FSCACHE) += fscache_proc.o
+endif
+netfs-$(CONFIG_FSCACHE_STATS) += fscache_stats.o
+
obj-$(CONFIG_NETFS_SUPPORT) += netfs.o