aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2004-07-07 06:58:29 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2004-07-07 06:58:29 +0000
commit81d16e2d64d5d34bbc8497ca805a366ee4b27ddb (patch)
tree7998aba453b8e85f5c1ff786e4a53fc75bb833cc
parent6242f82d0782a1c0f19d4d0d248fb65464a75e4b (diff)
downloadsrc-81d16e2d64d5d34bbc8497ca805a366ee4b27ddb.tar.gz
src-81d16e2d64d5d34bbc8497ca805a366ee4b27ddb.zip
do the vfsstd thing instead of messing up our VFS_SYSCTL macro.
Notes
Notes: svn path=/head/; revision=131733
-rw-r--r--sys/kern/vfs_default.c10
-rw-r--r--sys/kern/vfs_init.c2
-rw-r--r--sys/sys/mount.h4
3 files changed, 14 insertions, 2 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index cc5603eb06e2..0c423d2d2d69 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -801,4 +801,14 @@ vfs_stdextattrctl(mp, cmd, filename_vp, attrnamespace, attrname, td)
return(EOPNOTSUPP);
}
+int
+vfs_stdsysctl(mp, op, req)
+ struct mount *mp;
+ fsctlop_t op;
+ struct sysctl_req *req;
+{
+
+ return (EOPNOTSUPP);
+}
+
/* end of vfs default ops */
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index b67ece7ffe11..871404c141ff 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -458,6 +458,8 @@ vfs_register(struct vfsconf *vfc)
if (vfsops->vfs_extattrctl == NULL)
/* extended attribute control */
vfsops->vfs_extattrctl = vfs_stdextattrctl;
+ if (vfsops->vfs_sysctl == NULL)
+ vfsops->vfs_sysctl = vfs_stdsysctl;
/*
* Call init function for this VFS...
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 3f8f098b2046..fafdeac068da 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -526,8 +526,7 @@ struct vfsops {
#define VFS_EXTATTRCTL(MP, C, FN, NS, N, P) \
(*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N, P)
#define VFS_SYSCTL(MP, OP, REQ) \
- ((MP) == NULL ? ENOTSUP : \
- (*(MP)->mnt_op->vfs_sysctl)(MP, OP, REQ))
+ (*(MP)->mnt_op->vfs_sysctl)(MP, OP, REQ)
#include <sys/module.h>
@@ -605,6 +604,7 @@ vfs_vptofh_t vfs_stdvptofh;
vfs_init_t vfs_stdinit;
vfs_uninit_t vfs_stduninit;
vfs_extattrctl_t vfs_stdextattrctl;
+vfs_sysctl_t vfs_stdsysctl;
/* XXX - these should be indirect functions!!! */
int softdep_fsync(struct vnode *);