vfs: drop several macros hidding eopnotsupp

make it obvious in the vfsops assignment that an op isnt supported.

from thib4711 at mailbox dot org
ok claudio@

diff --git a/sys/isofs/cd9660/cd9660_extern.h b/sys/isofs/cd9660/cd9660_extern.h
index 2a5348e..b25abdc 100644 (file)
--- a/sys/isofs/cd9660/cd9660_extern.h
+++ b/sys/isofs/cd9660/cd9660_extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cd9660_extern.h,v 1.15 2020/01/20 23:21:55 claudio Exp $      */
+/*     $OpenBSD: cd9660_extern.h,v 1.16 2023/07/17 09:41:20 semarie Exp $      */
 /*     $NetBSD: cd9660_extern.h,v 1.1 1997/01/24 00:24:53 cgd Exp $    */
 
 /*-
@@ -94,8 +94,6 @@ int cd9660_vptofh(struct vnode *, struct fid *);
 int cd9660_init(struct vfsconf *);
 int cd9660_check_export(struct mount *, struct mbuf *, int *,
                              struct ucred **);
-#define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
-                                    size_t, struct proc *))eopnotsupp)
 
 int cd9660_mountroot(void); 
 

diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index ef0ffbb..268ca65 100644 (file)
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cd9660_vfsops.c,v 1.97 2023/03/08 04:43:08 guenther Exp $     */
+/*     $OpenBSD: cd9660_vfsops.c,v 1.98 2023/07/17 09:41:20 semarie Exp $      */
 /*     $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $    */
 
 /*-
@@ -72,7 +72,7 @@ const struct vfsops cd9660_vfsops = {
        .vfs_fhtovp     = cd9660_fhtovp,
        .vfs_vptofh     = cd9660_vptofh,
        .vfs_init       = cd9660_init,
-       .vfs_sysctl     = cd9660_sysctl,
+       .vfs_sysctl     = (void *)eopnotsupp,
        .vfs_checkexp   = cd9660_check_export,
 };
 

diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 0de3766..5b27bb7 100644 (file)
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: msdosfs_vfsops.c,v 1.96 2022/08/12 14:30:52 visa Exp $        */
+/*     $OpenBSD: msdosfs_vfsops.c,v 1.97 2023/07/17 09:41:20 semarie Exp $     */
 /*     $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $       */
 
 /*-
@@ -762,27 +762,18 @@ msdosfs_check_export(struct mount *mp, struct mbuf *nam, int *exflagsp,
        return (0);
 }
 
-#define msdosfs_vget ((int (*)(struct mount *, ino_t, struct vnode **)) \
-                     eopnotsupp)
-
-#define msdosfs_quotactl ((int (*)(struct mount *, int, uid_t, caddr_t, \
-                                       struct proc *))eopnotsupp)
-
-#define msdosfs_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
-                                    size_t, struct proc *))eopnotsupp)
-
 const struct vfsops msdosfs_vfsops = {
        .vfs_mount      = msdosfs_mount,
        .vfs_start      = msdosfs_start,
        .vfs_unmount    = msdosfs_unmount,
        .vfs_root       = msdosfs_root,
-       .vfs_quotactl   = msdosfs_quotactl,
+       .vfs_quotactl   = (void *)eopnotsupp,
        .vfs_statfs     = msdosfs_statfs,
        .vfs_sync       = msdosfs_sync,
-       .vfs_vget       = msdosfs_vget,
+       .vfs_vget       = (void *)eopnotsupp,
        .vfs_fhtovp     = msdosfs_fhtovp,
        .vfs_vptofh     = msdosfs_vptofh,
        .vfs_init       = msdosfs_init,
-       .vfs_sysctl     = msdosfs_sysctl,
+       .vfs_sysctl     = (void *)eopnotsupp,
        .vfs_checkexp   = msdosfs_check_export,
 };