From b900f4b89b4d44aa1a79111763b6dfab51e5e3af Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 1 Mar 2022 15:25:00 +0000 Subject: [PATCH] netfs: Split some core bits out into their own file Split some core bits out into their own file. More bits will be added to this file later. Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: linux-cachefs@redhat.com Link: https://lore.kernel.org/r/164623006934.3564931.17932680017894039748.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/164678218407.1200972.1731208226140990280.stgit@warthog.procyon.org.uk/ # v2 Link: https://lore.kernel.org/r/164692920944.2099075.11990502173226013856.stgit@warthog.procyon.org.uk/ # v3 --- fs/netfs/Makefile | 1 + fs/netfs/internal.h | 7 +++++-- fs/netfs/io.c | 10 ---------- fs/netfs/main.c | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 fs/netfs/main.c diff --git a/fs/netfs/Makefile b/fs/netfs/Makefile index 88b9045..f684c0c 100644 --- a/fs/netfs/Makefile +++ b/fs/netfs/Makefile @@ -3,6 +3,7 @@ netfs-y := \ buffered_read.o \ io.o \ + main.o \ objects.o netfs-$(CONFIG_NETFS_STATS) += stats.o diff --git a/fs/netfs/internal.h b/fs/netfs/internal.h index 05c4b2fe..b7b0e3d 100644 --- a/fs/netfs/internal.h +++ b/fs/netfs/internal.h @@ -23,11 +23,14 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq); /* * io.c */ -extern unsigned int netfs_debug; - int netfs_begin_read(struct netfs_io_request *rreq, bool sync); /* + * main.c + */ +extern unsigned int netfs_debug; + +/* * objects.c */ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, diff --git a/fs/netfs/io.c b/fs/netfs/io.c index 6d43f9e..4289258 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -15,16 +15,6 @@ #include #include #include "internal.h" -#define CREATE_TRACE_POINTS -#include - -MODULE_DESCRIPTION("Network fs support"); -MODULE_AUTHOR("Red Hat, Inc."); -MODULE_LICENSE("GPL"); - -unsigned netfs_debug; -module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO); -MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask"); /* * Clear the unread part of an I/O request. diff --git a/fs/netfs/main.c b/fs/netfs/main.c new file mode 100644 index 0000000..0685687 --- /dev/null +++ b/fs/netfs/main.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Miscellaneous bits for the netfs support library. + * + * Copyright (C) 2022 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells@redhat.com) + */ + +#include +#include +#include "internal.h" +#define CREATE_TRACE_POINTS +#include + +MODULE_DESCRIPTION("Network fs support"); +MODULE_AUTHOR("Red Hat, Inc."); +MODULE_LICENSE("GPL"); + +unsigned netfs_debug; +module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO); +MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask"); -- 2.7.4