Hi, The following diff removes some #define which hide generic vop functions behind another classic name.
It makes clearer which vop functions are real fileystem-implementations and which one are only stubs. Only mfs and cd9660 are using such #define. No functional changes are intented. Comments or OK ? -- Sebastien Marie blob - a662a6787ef9a6b06363441fb8778d66a29c04d0 blob + 2c54a18f3ff43c3eac65a4e520f4dcb625fa2473 --- sys/ufs/mfs/mfs_extern.h +++ sys/ufs/mfs/mfs_extern.h @@ -61,6 +61,5 @@ int mfs_close(void *); int mfs_inactive(void *); int mfs_reclaim(void *); int mfs_print(void *); -#define mfs_revoke vop_generic_revoke int mfs_badop(void *); blob - 00c0c24efbe9fa4046b1569a12be47c74d3d180f blob + b5b1d430cc9f0dac3eb40bdc71ccc16f5efa67cf --- sys/ufs/mfs/mfs_vnops.c +++ sys/ufs/mfs/mfs_vnops.c @@ -61,9 +61,9 @@ const struct vops mfs_vops = { .vop_ioctl = mfs_ioctl, .vop_poll = mfs_badop, .vop_kqfilter = mfs_badop, - .vop_revoke = mfs_revoke, + .vop_revoke = vop_generic_revoke, .vop_fsync = spec_fsync, .vop_remove = mfs_badop, .vop_link = mfs_badop, blob - b7cc93f86c5c8d28c28b3ad81286600941c23875 blob + 3c70501643e8bf15af237c3056919bd222dc4206 --- sys/isofs/cd9660/cd9660_vnops.c +++ sys/isofs/cd9660/cd9660_vnops.c @@ -811,44 +811,29 @@ cd9660_pathconf(void *v) /* * Global vfs data structures for isofs */ -#define cd9660_create eopnotsupp -#define cd9660_mknod eopnotsupp -#define cd9660_write eopnotsupp -#define cd9660_fsync nullop -#define cd9660_remove eopnotsupp -#define cd9660_rename eopnotsupp -#define cd9660_mkdir eopnotsupp -#define cd9660_rmdir eopnotsupp -#define cd9660_advlock eopnotsupp -#define cd9660_valloc eopnotsupp -#define cd9660_vfree eopnotsupp -#define cd9660_truncate eopnotsupp -#define cd9660_update eopnotsupp -#define cd9660_bwrite eopnotsupp -#define cd9660_revoke vop_generic_revoke /* Global vfs data structures for cd9660. */ const struct vops cd9660_vops = { .vop_lookup = cd9660_lookup, - .vop_create = cd9660_create, - .vop_mknod = cd9660_mknod, + .vop_create = eopnotsupp, + .vop_mknod = eopnotsupp, .vop_open = cd9660_open, .vop_close = cd9660_close, .vop_access = cd9660_access, .vop_getattr = cd9660_getattr, .vop_setattr = cd9660_setattr, .vop_read = cd9660_read, - .vop_write = cd9660_write, + .vop_write = eopnotsupp, .vop_ioctl = cd9660_ioctl, .vop_poll = cd9660_poll, .vop_kqfilter = cd9660_kqfilter, - .vop_revoke = cd9660_revoke, - .vop_fsync = cd9660_fsync, - .vop_remove = cd9660_remove, + .vop_revoke = vop_generic_revoke, + .vop_fsync = nullop, + .vop_remove = eopnotsupp, .vop_link = cd9660_link, - .vop_rename = cd9660_rename, - .vop_mkdir = cd9660_mkdir, - .vop_rmdir = cd9660_rmdir, + .vop_rename = eopnotsupp, + .vop_mkdir = eopnotsupp, + .vop_rmdir = eopnotsupp, .vop_symlink = cd9660_symlink, .vop_readdir = cd9660_readdir, .vop_readlink = cd9660_readlink, @@ -862,8 +847,8 @@ const struct vops cd9660_vops = { .vop_print = cd9660_print, .vop_islocked = cd9660_islocked, .vop_pathconf = cd9660_pathconf, - .vop_advlock = cd9660_advlock, - .vop_bwrite = vop_generic_bwrite + .vop_advlock = eopnotsupp, + .vop_bwrite = vop_generic_bwrite, }; /* Special device vnode ops */