summaryrefslogtreecommitdiffstats
path: root/fs/netfs/fscache_main.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2023-11-20 15:55:18 +0000
committerDavid Howells <dhowells@redhat.com>2023-12-24 15:08:46 +0000
commit915cd30cdea8811cddd8f59e57dd9dd0a814b76c (patch)
tree69307721a0a976967278ca5b8753e6ad86623120 /fs/netfs/fscache_main.c
parent47757ea83a545536cdd418fec84b7a970710e48b (diff)
downloadlinux-915cd30cdea8811cddd8f59e57dd9dd0a814b76c.tar.gz
linux-915cd30cdea8811cddd8f59e57dd9dd0a814b76c.tar.bz2
linux-915cd30cdea8811cddd8f59e57dd9dd0a814b76c.zip
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/fscache_main.c')
-rw-r--r--fs/netfs/fscache_main.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/netfs/fscache_main.c b/fs/netfs/fscache_main.c
index dad85fd84f6f..00600a4d9ce5 100644
--- a/fs/netfs/fscache_main.c
+++ b/fs/netfs/fscache_main.c
@@ -8,18 +8,9 @@
#define FSCACHE_DEBUG_LEVEL CACHE
#include <linux/module.h>
#include <linux/init.h>
-#define CREATE_TRACE_POINTS
#include "internal.h"
-
-MODULE_DESCRIPTION("FS Cache Manager");
-MODULE_AUTHOR("Red Hat, Inc.");
-MODULE_LICENSE("GPL");
-
-unsigned fscache_debug;
-module_param_named(debug, fscache_debug, uint,
- S_IWUSR | S_IRUGO);
-MODULE_PARM_DESC(fscache_debug,
- "FS-Cache debugging mask");
+#define CREATE_TRACE_POINTS
+#include <trace/events/fscache.h>
EXPORT_TRACEPOINT_SYMBOL(fscache_access_cache);
EXPORT_TRACEPOINT_SYMBOL(fscache_access_volume);
@@ -92,7 +83,7 @@ static int __init fscache_init(void)
goto error_cookie_jar;
}
- pr_notice("Loaded\n");
+ pr_notice("FS-Cache loaded\n");
return 0;
error_cookie_jar:
@@ -115,7 +106,7 @@ static void __exit fscache_exit(void)
kmem_cache_destroy(fscache_cookie_jar);
fscache_proc_cleanup();
destroy_workqueue(fscache_wq);
- pr_notice("Unloaded\n");
+ pr_notice("FS-Cache unloaded\n");
}
module_exit(fscache_exit);