diff options
| author | dholland <dholland@NetBSD.org> | 2021-07-18 23:57:13 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2021-07-18 23:57:13 +0000 |
| commit | 854e06dab67fc7c2b03ac55c3e6e76f06369d702 (patch) | |
| tree | 45a35bb41b46044c42e827692dec976a3fb96eb3 /sys/ufs/lfs | |
| parent | 84f30772ad93dd5d19313d031d87026b1545514e (diff) | |
Abolish all the silly indirection macros for initializing vnode ops tables.
These are things of the form #define foofs_op genfs_op, or #define
foofs_op genfs_eopnotsupp, or similar. They serve no purpose besides
obfuscation, and have gotten cutpasted all over everywhere.
Diffstat (limited to 'sys/ufs/lfs')
| -rw-r--r-- | sys/ufs/lfs/lfs_vnops.c | 42 | ||||
| -rw-r--r-- | sys/ufs/lfs/ulfs_extern.h | 12 |
2 files changed, 22 insertions, 32 deletions
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 44057b73b6f..2984b4b97df 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.338 2021/07/18 23:56:14 dholland Exp $ */ +/* $NetBSD: lfs_vnops.c,v 1.339 2021/07/18 23:57:15 dholland Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -125,7 +125,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.338 2021/07/18 23:56:14 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.339 2021/07/18 23:57:15 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -197,14 +197,14 @@ const struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { { &vop_write_desc, lfs_write }, /* write */ { &vop_fallocate_desc, genfs_eopnotsupp }, /* fallocate */ { &vop_fdiscard_desc, genfs_eopnotsupp }, /* fdiscard */ - { &vop_ioctl_desc, ulfs_ioctl }, /* ioctl */ + { &vop_ioctl_desc, genfs_enoioctl }, /* ioctl */ { &vop_fcntl_desc, lfs_fcntl }, /* fcntl */ - { &vop_poll_desc, ulfs_poll }, /* poll */ + { &vop_poll_desc, genfs_poll }, /* poll */ { &vop_kqfilter_desc, genfs_kqfilter }, /* kqfilter */ - { &vop_revoke_desc, ulfs_revoke }, /* revoke */ + { &vop_revoke_desc, genfs_revoke }, /* revoke */ { &vop_mmap_desc, lfs_mmap }, /* mmap */ { &vop_fsync_desc, lfs_fsync }, /* fsync */ - { &vop_seek_desc, ulfs_seek }, /* seek */ + { &vop_seek_desc, genfs_seek }, /* seek */ { &vop_remove_desc, lfs_remove }, /* remove */ { &vop_link_desc, lfs_link }, /* link */ { &vop_rename_desc, lfs_rename }, /* rename */ @@ -213,15 +213,15 @@ const struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { { &vop_symlink_desc, lfs_symlink }, /* symlink */ { &vop_readdir_desc, ulfs_readdir }, /* readdir */ { &vop_readlink_desc, ulfs_readlink }, /* readlink */ - { &vop_abortop_desc, ulfs_abortop }, /* abortop */ + { &vop_abortop_desc, genfs_abortop }, /* abortop */ { &vop_inactive_desc, lfs_inactive }, /* inactive */ { &vop_reclaim_desc, lfs_reclaim }, /* reclaim */ - { &vop_lock_desc, ulfs_lock }, /* lock */ - { &vop_unlock_desc, ulfs_unlock }, /* unlock */ + { &vop_lock_desc, genfs_lock }, /* lock */ + { &vop_unlock_desc, genfs_unlock }, /* unlock */ { &vop_bmap_desc, ulfs_bmap }, /* bmap */ { &vop_strategy_desc, lfs_strategy }, /* strategy */ { &vop_print_desc, ulfs_print }, /* print */ - { &vop_islocked_desc, ulfs_islocked }, /* islocked */ + { &vop_islocked_desc, genfs_islocked }, /* islocked */ { &vop_pathconf_desc, ulfs_pathconf }, /* pathconf */ { &vop_advlock_desc, ulfs_advlock }, /* advlock */ { &vop_bwrite_desc, lfs_bwrite }, /* bwrite */ @@ -249,14 +249,14 @@ const struct vnodeopv_entry_desc lfs_specop_entries[] = { { &vop_setattr_desc, lfs_setattr }, /* setattr */ { &vop_read_desc, ulfsspec_read }, /* read */ { &vop_write_desc, ulfsspec_write }, /* write */ - { &vop_fcntl_desc, ulfs_fcntl }, /* fcntl */ + { &vop_fcntl_desc, genfs_fcntl }, /* fcntl */ { &vop_fsync_desc, spec_fsync }, /* fsync */ { &vop_inactive_desc, lfs_inactive }, /* inactive */ { &vop_reclaim_desc, lfs_reclaim }, /* reclaim */ - { &vop_lock_desc, ulfs_lock }, /* lock */ - { &vop_unlock_desc, ulfs_unlock }, /* unlock */ + { &vop_lock_desc, genfs_lock }, /* lock */ + { &vop_unlock_desc, genfs_unlock }, /* unlock */ { &vop_print_desc, ulfs_print }, /* print */ - { &vop_islocked_desc, ulfs_islocked }, /* islocked */ + { &vop_islocked_desc, genfs_islocked }, /* islocked */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ { &vop_openextattr_desc, lfs_openextattr }, /* openextattr */ { &vop_closeextattr_desc, lfs_closeextattr }, /* closeextattr */ @@ -280,15 +280,15 @@ const struct vnodeopv_entry_desc lfs_fifoop_entries[] = { { &vop_setattr_desc, lfs_setattr }, /* setattr */ { &vop_read_desc, ulfsfifo_read }, /* read */ { &vop_write_desc, ulfsfifo_write }, /* write */ - { &vop_fcntl_desc, ulfs_fcntl }, /* fcntl */ + { &vop_fcntl_desc, genfs_fcntl }, /* fcntl */ { &vop_fsync_desc, vn_fifo_bypass }, /* fsync */ { &vop_inactive_desc, lfs_inactive }, /* inactive */ { &vop_reclaim_desc, lfs_reclaim }, /* reclaim */ - { &vop_lock_desc, ulfs_lock }, /* lock */ - { &vop_unlock_desc, ulfs_unlock }, /* unlock */ + { &vop_lock_desc, genfs_lock }, /* lock */ + { &vop_unlock_desc, genfs_unlock }, /* unlock */ { &vop_strategy_desc, vn_fifo_bypass }, /* strategy */ { &vop_print_desc, ulfs_print }, /* print */ - { &vop_islocked_desc, ulfs_islocked }, /* islocked */ + { &vop_islocked_desc, genfs_islocked }, /* islocked */ { &vop_bwrite_desc, lfs_bwrite }, /* bwrite */ { &vop_openextattr_desc, lfs_openextattr }, /* openextattr */ { &vop_closeextattr_desc, lfs_closeextattr }, /* closeextattr */ @@ -1873,7 +1873,7 @@ lfs_fcntl(void *v) /* Only respect LFS fcntls on fs root or Ifile */ if (VTOI(ap->a_vp)->i_number != ULFS_ROOTINO && VTOI(ap->a_vp)->i_number != LFS_IFILE_INUM) { - return ulfs_fcntl(v); + return genfs_fcntl(v); } /* Avoid locking a draining lock */ @@ -2152,7 +2152,7 @@ segwait_common: return 0; default: - return ulfs_fcntl(v); + return genfs_fcntl(v); } return 0; } @@ -2214,7 +2214,7 @@ lfs_mmap(void *v) if (VTOI(ap->a_vp)->i_number == LFS_IFILE_INUM) return EOPNOTSUPP; - return ulfs_mmap(v); + return genfs_mmap(v); } static int diff --git a/sys/ufs/lfs/ulfs_extern.h b/sys/ufs/lfs/ulfs_extern.h index a4085a601fe..cf33bb49e4a 100644 --- a/sys/ufs/lfs/ulfs_extern.h +++ b/sys/ufs/lfs/ulfs_extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: ulfs_extern.h,v 1.25 2020/01/17 20:08:10 ad Exp $ */ +/* $NetBSD: ulfs_extern.h,v 1.26 2021/07/18 23:57:15 dholland Exp $ */ /* from NetBSD: ufs_extern.h,v 1.79 2015/03/27 17:27:56 riastradh Exp */ /*- @@ -59,7 +59,6 @@ struct vattr; struct vnode; __BEGIN_DECLS -#define ulfs_abortop genfs_abortop int ulfs_access(void *); int ulfs_advlock(void *); int ulfs_bmap(void *); @@ -67,14 +66,8 @@ int ulfs_close(void *); int ulfs_create(void *); int ulfs_getattr(void *); int ulfs_inactive(void *); -#define ulfs_fcntl genfs_fcntl -#define ulfs_ioctl genfs_enoioctl -#define ulfs_islocked genfs_islocked int ulfs_link(void *); -#define ulfs_lock genfs_lock int ulfs_lookup(void *); -#define ulfs_mmap genfs_mmap -#define ulfs_revoke genfs_revoke int ulfs_open(void *); int ulfs_pathconf(void *); int ulfs_print(void *); @@ -82,11 +75,8 @@ int ulfs_readdir(void *); int ulfs_readlink(void *); int ulfs_remove(void *); int ulfs_rmdir(void *); -#define ulfs_seek genfs_seek -#define ulfs_poll genfs_poll int ulfs_setattr(void *); int ulfs_strategy(void *); -#define ulfs_unlock genfs_unlock int ulfs_whiteout(void *); int ulfsspec_close(void *); int ulfsspec_read(void *); |
