From: Fabian Frederick <fabf@skynet.be>
To: akpm@linux-foundation.org
Cc: jaharkes@cs.cmu.edu, coda@cs.cmu.edu,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
fabf@skynet.be
Subject: [PATCH 5/7 linux-next] coda: remove sysctl object from module when unused
Date: Fri, 19 Oct 2018 10:19:31 +0200 [thread overview]
Message-ID: <1539937173-26260-6-git-send-email-fabf@skynet.be> (raw)
In-Reply-To: <1539937173-26260-1-git-send-email-fabf@skynet.be>
Inspired by NFS sysctl process
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
fs/coda/Makefile | 3 ++-
fs/coda/coda_int.h | 10 ++++++++++
fs/coda/coda_linux.h | 4 ----
fs/coda/sysctl.c | 11 -----------
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/fs/coda/Makefile b/fs/coda/Makefile
index 1bab69a..30e4e1b 100644
--- a/fs/coda/Makefile
+++ b/fs/coda/Makefile
@@ -5,7 +5,8 @@
obj-$(CONFIG_CODA_FS) += coda.o
coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
- coda_linux.o symlink.o pioctl.o sysctl.o
+ coda_linux.o symlink.o pioctl.o
+coda-$(CONFIG_SYSCTL) += sysctl.o
# If you want debugging output, please uncomment the following line.
diff --git a/fs/coda/coda_int.h b/fs/coda/coda_int.h
index bb0b3e0..f82b59c 100644
--- a/fs/coda/coda_int.h
+++ b/fs/coda/coda_int.h
@@ -13,9 +13,19 @@ extern int coda_fake_statfs;
void coda_destroy_inodecache(void);
int __init coda_init_inodecache(void);
int coda_fsync(struct file *coda_file, loff_t start, loff_t end, int datasync);
+
+#ifdef CONFIG_SYSCTL
void coda_sysctl_init(void);
void coda_sysctl_clean(void);
+#else
+static inline void coda_sysctl_init(void)
+{
+}
+static inline void coda_sysctl_clean(void)
+{
+}
+#endif
#endif /* _CODA_INT_ */
diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
index 903f2a3..4087264 100644
--- a/fs/coda/coda_linux.h
+++ b/fs/coda/coda_linux.h
@@ -59,10 +59,6 @@ void coda_vattr_to_iattr(struct inode *, struct coda_vattr *);
void coda_iattr_to_vattr(struct iattr *, struct coda_vattr *);
unsigned short coda_flags_to_cflags(unsigned short);
-/* sysctl.h */
-void coda_sysctl_init(void);
-void coda_sysctl_clean(void);
-
#define CODA_ALLOC(ptr, cast, size) do { \
if (size < PAGE_SIZE) \
ptr = kzalloc((unsigned long) size, GFP_KERNEL); \
diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index 0301d45..fda3b70 100644
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -12,7 +12,6 @@
#include "coda_int.h"
-#ifdef CONFIG_SYSCTL
static struct ctl_table_header *fs_table_header;
static struct ctl_table coda_table[] = {
@@ -62,13 +61,3 @@ void coda_sysctl_clean(void)
fs_table_header = NULL;
}
}
-
-#else
-void coda_sysctl_init(void)
-{
-}
-
-void coda_sysctl_clean(void)
-{
-}
-#endif
--
2.4.11
next prev parent reply other threads:[~2018-10-19 8:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 8:19 [PATCH 0/7 linux-next] coda: fs clean-up Fabian Frederick
2018-10-19 8:19 ` [PATCH 1/7 linux-next] coda: remove CODA_FREE Fabian Frederick
2018-10-19 8:19 ` [PATCH 2/7 linux-next] coda: destroy mutex in put_super() Fabian Frederick
2018-10-19 8:19 ` [PATCH 3/7 linux-next] coda: use SIZE() for stat Fabian Frederick
2018-10-19 8:19 ` [PATCH 4/7 linux-next] coda: add __init to init_coda_psdev() Fabian Frederick
2018-10-19 8:19 ` Fabian Frederick [this message]
2018-10-19 8:19 ` [PATCH 6/7 linux-next] coda: remove sb test in coda_fid_to_inode() Fabian Frederick
2018-10-19 8:19 ` [PATCH 7/7 linux-next] coda: ftoc validity check integration Fabian Frederick
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1539937173-26260-6-git-send-email-fabf@skynet.be \
--to=fabf@skynet.be \
--cc=akpm@linux-foundation.org \
--cc=coda@cs.cmu.edu \
--cc=jaharkes@cs.cmu.edu \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).