Hi,
The following diff removes vop_generic_{,un,is}lock functions.
These functions are only stubs (returning 0). Replace them by using
nullop function (same behaviour). There is no intented behaviour
changes.
While here, I reordered some vop_islocked member in structs to be next
others vop_{,un}lock members.
Note that I intent to reintroduce vop_generic_{,un,is}lock functions
later, but for now it is simplier to just remove them.
Comments or OK ?
--
Sebastien Marie
diff 5543f5ef435017650e5c7febf3b39d036a3c0b60 /home/semarie/repos/openbsd/src
blob - c018508380a9c91644585eec77e5070cf0c4f00c
file + sys/kern/spec_vnops.c
--- sys/kern/spec_vnops.c
+++ sys/kern/spec_vnops.c
@@ -89,9 +89,9 @@ const struct vops spec_vops = {
.vop_abortop = vop_generic_badop,
.vop_inactive = spec_inactive,
.vop_reclaim = nullop,
- .vop_lock = vop_generic_lock,
- .vop_unlock = vop_generic_unlock,
- .vop_islocked = vop_generic_islocked,
+ .vop_lock = nullop,
+ .vop_unlock = nullop,
+ .vop_islocked = nullop,
.vop_bmap = vop_generic_bmap,
.vop_strategy = spec_strategy,
.vop_print = spec_print,
blob - b661ba724de5453b6489d74935f3155ba7771de9
file + sys/kern/vfs_default.c
--- sys/kern/vfs_default.c
+++ sys/kern/vfs_default.c
@@ -167,37 +167,6 @@ vop_generic_abortop(void *v)
return (0);
}
-/*
- * Stubs to use when there is no locking to be done on the underlying object.
- * A minimal shared lock is necessary to ensure that the underlying object
- * is not revoked while an operation is in progress. So, an active shared
- * count should be maintained in an auxiliary vnode lock structure. However,
- * that's not done now.
- */
-int
-vop_generic_lock(void *v)
-{
- return (0);
-}
-
-/*
- * Decrement the active use count. (Not done currently)
- */
-int
-vop_generic_unlock(void *v)
-{
- return (0);
-}
-
-/*
- * Return whether or not the node is in use. (Not done currently)
- */
-int
-vop_generic_islocked(void *v)
-{
- return (0);
-}
-
const struct filterops generic_filtops = {
.f_flags = FILTEROP_ISFD,
.f_attach = NULL,
blob - 65ef86619a77d7a6858595757eb52a4308604ebb
file + sys/kern/vfs_sync.c
--- sys/kern/vfs_sync.c
+++ sys/kern/vfs_sync.c
@@ -267,9 +267,9 @@ const struct vops sync_vops = {
.vop_fsync = sync_fsync,
.vop_inactive = sync_inactive,
.vop_reclaim = nullop,
- .vop_lock = vop_generic_lock,
- .vop_unlock = vop_generic_unlock,
- .vop_islocked = vop_generic_islocked,
+ .vop_lock = nullop,
+ .vop_unlock = nullop,
+ .vop_islocked = nullop,
.vop_print = sync_print
};
blob - a2a4643c4649ece502b8af46328cd953a7a93450
file + sys/miscfs/deadfs/dead_vnops.c
--- sys/miscfs/deadfs/dead_vnops.c
+++ sys/miscfs/deadfs/dead_vnops.c
@@ -89,11 +89,11 @@ const struct vops dead_vops = {
.vop_inactive = dead_inactive,
.vop_reclaim = nullop,
.vop_lock = dead_lock,
- .vop_unlock = vop_generic_unlock,
+ .vop_unlock = nullop,
+ .vop_islocked = nullop,
.vop_bmap = dead_bmap,
.vop_strategy = dead_strategy,
.vop_print = dead_print,
- .vop_islocked = vop_generic_islocked,
.vop_pathconf = dead_ebadf,
.vop_advlock = dead_ebadf,
.vop_bwrite = nullop,
blob - f2d49e4322df91b95dbe4ae650cdc9abee4bd1ef
file + sys/miscfs/fifofs/fifo_vnops.c
--- sys/miscfs/fifofs/fifo_vnops.c
+++ sys/miscfs/fifofs/fifo_vnops.c
@@ -91,12 +91,12 @@ const struct vops fifo_vops = {
.vop_abortop = vop_generic_badop,
.vop_inactive = fifo_inactive,
.vop_reclaim = fifo_reclaim,
- .vop_lock = vop_generic_lock,
- .vop_unlock = vop_generic_unlock,
+ .vop_lock = nullop,
+ .vop_unlock = nullop,
+ .vop_islocked = nullop,
.vop_bmap = vop_generic_bmap,
.vop_strategy = vop_generic_badop,
.vop_print = fifo_print,
- .vop_islocked = vop_generic_islocked,
.vop_pathconf = fifo_pathconf,
.vop_advlock = fifo_advlock,
.vop_bwrite = nullop
blob - fa334e23c17fe3ad5ef07a32f5b25807d7225ae8
file + sys/ntfs/ntfs_vnops.c
--- sys/ntfs/ntfs_vnops.c
+++ sys/ntfs/ntfs_vnops.c
@@ -668,9 +668,9 @@ const struct vops ntfs_vops = {
.vop_reclaim = ntfs_reclaim,
.vop_print = ntfs_print,
.vop_pathconf = ntfs_pathconf,
- .vop_islocked = vop_generic_islocked,
- .vop_unlock = vop_generic_unlock,
- .vop_lock = vop_generic_lock,
+ .vop_islocked = nullop,
+ .vop_unlock = nullop,
+ .vop_lock = nullop,
.vop_lookup = ntfs_lookup,
.vop_access = ntfs_access,
.vop_close = ntfs_close,
blob - 3668f954a9aab3fd49ed5e41e7d4ab51b4bf0a90
file + sys/sys/vnode.h
--- sys/sys/vnode.h
+++ sys/sys/vnode.h
@@ -630,9 +630,6 @@ int vop_generic_abortop(void *);
int vop_generic_badop(void *);
int vop_generic_bmap(void *);
int vop_generic_bwrite(void *);
-int vop_generic_islocked(void *);
-int vop_generic_lock(void *);
-int vop_generic_unlock(void *);
int vop_generic_revoke(void *);
int vop_generic_kqfilter(void *);
int vop_generic_lookup(void *);
blob - 98484b064db28b1911d05a9c22d8ae7c5265608a
file + sys/ufs/mfs/mfs_vnops.c
--- sys/ufs/mfs/mfs_vnops.c
+++ sys/ufs/mfs/mfs_vnops.c
@@ -74,12 +74,12 @@ const struct vops mfs_vops = {
.vop_abortop = vop_generic_badop,
.vop_inactive = mfs_inactive,
.vop_reclaim = mfs_reclaim,
- .vop_lock = vop_generic_lock,
- .vop_unlock = vop_generic_unlock,
+ .vop_lock = nullop,
+ .vop_unlock = nullop,
+ .vop_islocked = nullop,
.vop_bmap = vop_generic_bmap,
.vop_strategy = mfs_strategy,
.vop_print = mfs_print,
- .vop_islocked = vop_generic_islocked,
.vop_pathconf = vop_generic_badop,
.vop_advlock = vop_generic_badop,
.vop_bwrite = vop_generic_bwrite
