summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c9
-rw-r--r--sys/fs/devfs/devfs_vnops.c6
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c3
-rw-r--r--sys/fs/hpfs/hpfs_vnops.c3
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c3
-rw-r--r--sys/fs/ntfs/ntfs_vnops.c3
-rw-r--r--sys/fs/nwfs/nwfs_vnops.c3
-rw-r--r--sys/fs/pseudofs/pseudofs_vnops.c3
-rw-r--r--sys/fs/smbfs/smbfs_vnops.c3
-rw-r--r--sys/fs/udf/udf_vnops.c3
-rw-r--r--sys/fs/unionfs/union_vnops.c1
-rw-r--r--sys/gnu/ext2fs/ext2_vnops.c9
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vnops.c9
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c9
-rw-r--r--sys/nfsclient/nfs_vnops.c6
-rw-r--r--sys/ufs/ufs/ufs_vnops.c9
16 files changed, 0 insertions, 82 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index af87aaa..1fae0f7 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -787,8 +787,6 @@ static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
{ &vop_ioctl_desc, (vop_t *) cd9660_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_pathconf_desc, (vop_t *) cd9660_pathconf },
{ &vop_print_desc, (vop_t *) vop_null },
@@ -798,7 +796,6 @@ static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
{ &vop_strategy_desc, (vop_t *) cd9660_strategy },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
@@ -814,12 +811,9 @@ static struct vnodeopv_entry_desc cd9660_specop_entries[] = {
{ &vop_access_desc, (vop_t *) cd9660_access },
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) vop_null },
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_specop_opv_desc =
@@ -832,12 +826,9 @@ static struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
{ &vop_access_desc, (vop_t *) cd9660_access },
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) vop_null },
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_fifoop_opv_desc =
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 8d3a131..3f28566 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -865,8 +865,6 @@ static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
{ &vop_access_desc, (vop_t *) devfs_access },
{ &vop_getattr_desc, (vop_t *) devfs_getattr },
{ &vop_ioctl_desc, (vop_t *) devfs_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) devfs_lookup },
{ &vop_mknod_desc, (vop_t *) devfs_mknod },
{ &vop_pathconf_desc, (vop_t *) devfs_pathconf },
@@ -882,7 +880,6 @@ static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
{ &vop_setlabel_desc, (vop_t *) devfs_setlabel },
#endif
{ &vop_symlink_desc, (vop_t *) devfs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc devfs_vnodeop_opv_desc =
@@ -894,8 +891,6 @@ static struct vnodeopv_entry_desc devfs_specop_entries[] = {
{ &vop_default_desc, (vop_t *) spec_vnoperate },
{ &vop_access_desc, (vop_t *) devfs_access },
{ &vop_getattr_desc, (vop_t *) devfs_getattr },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_pathconf_desc, (vop_t *) devfs_pathconf },
{ &vop_print_desc, (vop_t *) vop_null },
{ &vop_reclaim_desc, (vop_t *) devfs_reclaim },
@@ -905,7 +900,6 @@ static struct vnodeopv_entry_desc devfs_specop_entries[] = {
#ifdef MAC
{ &vop_setlabel_desc, (vop_t *) devfs_setlabel },
#endif
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc devfs_specop_opv_desc =
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 849835d..100a5dc 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -549,9 +549,6 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
{ &vop_readdir_desc, (vop_t *) fdesc_readdir },
{ &vop_reclaim_desc, (vop_t *) fdesc_reclaim },
{ &vop_setattr_desc, (vop_t *) fdesc_setattr },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ NULL, NULL }
};
static struct vnodeopv_desc fdesc_vnodeop_opv_desc =
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 4dff0f3..c3ad1e7 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -1267,9 +1267,6 @@ struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = {
{ &vop_print_desc, (vop_t *)hpfs_print },
{ &vop_create_desc, (vop_t *)hpfs_create },
{ &vop_remove_desc, (vop_t *)hpfs_remove },
- { &vop_islocked_desc, (vop_t *)vop_stdislocked },
- { &vop_unlock_desc, (vop_t *)vop_stdunlock },
- { &vop_lock_desc, (vop_t *)vop_stdlock },
{ &vop_cachedlookup_desc, (vop_t *)hpfs_lookup },
{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },
{ &vop_access_desc, (vop_t *)hpfs_access },
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 61b9545..06a677f 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1883,9 +1883,7 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
{ &vop_fsync_desc, (vop_t *) msdosfs_fsync },
{ &vop_getattr_desc, (vop_t *) msdosfs_getattr },
{ &vop_inactive_desc, (vop_t *) msdosfs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) msdosfs_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_mkdir_desc, (vop_t *) msdosfs_mkdir },
{ &vop_mknod_desc, (vop_t *) msdosfs_mknod },
@@ -1900,7 +1898,6 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) msdosfs_setattr },
{ &vop_strategy_desc, (vop_t *) msdosfs_strategy },
{ &vop_symlink_desc, (vop_t *) msdosfs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) msdosfs_write },
{ NULL, NULL }
};
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 5882602..90ca4f1 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -764,9 +764,6 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
{ &vop_print_desc, (vop_t *)vop_null },
{ &vop_pathconf_desc, ntfs_pathconf },
- { &vop_islocked_desc, (vop_t *)vop_stdislocked },
- { &vop_unlock_desc, (vop_t *)vop_stdunlock },
- { &vop_lock_desc, (vop_t *)vop_stdlock },
{ &vop_cachedlookup_desc, (vop_t *)ntfs_lookup },
{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index d1ecd32..6e17966 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -96,9 +96,7 @@ static struct vnodeopv_entry_desc nwfs_vnodeop_entries[] = {
{ &vop_putpages_desc, (vop_t *) nwfs_putpages },
{ &vop_ioctl_desc, (vop_t *) nwfs_ioctl },
{ &vop_inactive_desc, (vop_t *) nwfs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) nwfs_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) nwfs_lookup },
{ &vop_mkdir_desc, (vop_t *) nwfs_mkdir },
{ &vop_mknod_desc, (vop_t *) nwfs_mknod },
@@ -113,7 +111,6 @@ static struct vnodeopv_entry_desc nwfs_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) nwfs_setattr },
{ &vop_strategy_desc, (vop_t *) nwfs_strategy },
{ &vop_symlink_desc, (vop_t *) nwfs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) nwfs_write },
{ NULL, NULL }
};
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index b797aeb..54d2c5f 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -830,9 +830,6 @@ static struct vnodeopv_entry_desc pfs_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *)pfs_setattr },
{ &vop_symlink_desc, (vop_t *)vop_eopnotsupp },
{ &vop_write_desc, (vop_t *)pfs_write },
- { &vop_lock_desc, (vop_t *)vop_stdlock },
- { &vop_unlock_desc, (vop_t *)vop_stdunlock },
- { &vop_islocked_desc, (vop_t *)vop_stdislocked},
/* XXX I've probably forgotten a few that need vop_eopnotsupp */
{ NULL, (vop_t *)NULL }
};
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 0ff9319..fcb55d6 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -99,9 +99,7 @@ static struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = {
{ &vop_getpages_desc, (vop_t *) smbfs_getpages },
{ &vop_inactive_desc, (vop_t *) smbfs_inactive },
{ &vop_ioctl_desc, (vop_t *) smbfs_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) smbfs_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) smbfs_lookup },
{ &vop_mkdir_desc, (vop_t *) smbfs_mkdir },
{ &vop_mknod_desc, (vop_t *) smbfs_mknod },
@@ -118,7 +116,6 @@ static struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) smbfs_setattr },
{ &vop_strategy_desc, (vop_t *) smbfs_strategy },
{ &vop_symlink_desc, (vop_t *) smbfs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) smbfs_write },
#ifndef FB_RELENG3
{ &vop_getextattr_desc, (vop_t *) smbfs_getextattr },
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 4e4a4b6..0670275 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -73,8 +73,6 @@ static struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
{ &vop_cachedlookup_desc, (vop_t *) udf_lookup },
{ &vop_getattr_desc, (vop_t *) udf_getattr },
{ &vop_ioctl_desc, (vop_t *) udf_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_pathconf_desc, (vop_t *) udf_pathconf },
{ &vop_print_desc, (vop_t *) udf_print },
@@ -83,7 +81,6 @@ static struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
{ &vop_readlink_desc, (vop_t *) udf_readlink },
{ &vop_reclaim_desc, (vop_t *) udf_reclaim },
{ &vop_strategy_desc, (vop_t *) udf_strategy },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc udf_vnodeop_opv_desc =
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index dc09095..a625f29 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1851,7 +1851,6 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
{ &vop_getvobject_desc, (vop_t *) union_getvobject },
{ &vop_inactive_desc, (vop_t *) union_inactive },
{ &vop_ioctl_desc, (vop_t *) union_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_lease_desc, (vop_t *) union_lease },
{ &vop_link_desc, (vop_t *) union_link },
{ &vop_lookup_desc, (vop_t *) union_lookup },
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 99cb8e6..67660ea 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -136,9 +136,7 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_getwritemount_desc, (vop_t *) vop_stdgetwritemount },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) ext2_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_mkdir_desc, (vop_t *) ext2_mkdir },
{ &vop_mknod_desc, (vop_t *) ext2_mknod },
@@ -158,7 +156,6 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
{ &vop_strategy_desc, (vop_t *) ext2_strategy },
{ &vop_symlink_desc, (vop_t *) ext2_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2_write },
{ NULL, NULL }
};
@@ -173,13 +170,10 @@ static struct vnodeopv_entry_desc ext2_specop_entries[] = {
{ &vop_fsync_desc, (vop_t *) ext2_fsync },
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ext2_print },
{ &vop_read_desc, (vop_t *) ext2spec_read },
{ &vop_reclaim_desc, (vop_t *) ext2_reclaim },
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2spec_write },
{ NULL, NULL }
};
@@ -194,14 +188,11 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
{ &vop_fsync_desc, (vop_t *) ext2_fsync },
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_kqfilter_desc, (vop_t *) ext2fifo_kqfilter },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ext2_print },
{ &vop_read_desc, (vop_t *) ext2fifo_read },
{ &vop_reclaim_desc, (vop_t *) ext2_reclaim },
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2fifo_write },
{ NULL, NULL }
};
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 99cb8e6..67660ea 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -136,9 +136,7 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_getwritemount_desc, (vop_t *) vop_stdgetwritemount },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) ext2_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_mkdir_desc, (vop_t *) ext2_mkdir },
{ &vop_mknod_desc, (vop_t *) ext2_mknod },
@@ -158,7 +156,6 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
{ &vop_strategy_desc, (vop_t *) ext2_strategy },
{ &vop_symlink_desc, (vop_t *) ext2_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2_write },
{ NULL, NULL }
};
@@ -173,13 +170,10 @@ static struct vnodeopv_entry_desc ext2_specop_entries[] = {
{ &vop_fsync_desc, (vop_t *) ext2_fsync },
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ext2_print },
{ &vop_read_desc, (vop_t *) ext2spec_read },
{ &vop_reclaim_desc, (vop_t *) ext2_reclaim },
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2spec_write },
{ NULL, NULL }
};
@@ -194,14 +188,11 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
{ &vop_fsync_desc, (vop_t *) ext2_fsync },
{ &vop_getattr_desc, (vop_t *) ext2_getattr },
{ &vop_inactive_desc, (vop_t *) ext2_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_kqfilter_desc, (vop_t *) ext2fifo_kqfilter },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ext2_print },
{ &vop_read_desc, (vop_t *) ext2fifo_read },
{ &vop_reclaim_desc, (vop_t *) ext2_reclaim },
{ &vop_setattr_desc, (vop_t *) ext2_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ext2fifo_write },
{ NULL, NULL }
};
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index af87aaa..1fae0f7 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -787,8 +787,6 @@ static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
{ &vop_ioctl_desc, (vop_t *) cd9660_ioctl },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_pathconf_desc, (vop_t *) cd9660_pathconf },
{ &vop_print_desc, (vop_t *) vop_null },
@@ -798,7 +796,6 @@ static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
{ &vop_strategy_desc, (vop_t *) cd9660_strategy },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
@@ -814,12 +811,9 @@ static struct vnodeopv_entry_desc cd9660_specop_entries[] = {
{ &vop_access_desc, (vop_t *) cd9660_access },
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) vop_null },
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_specop_opv_desc =
@@ -832,12 +826,9 @@ static struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
{ &vop_access_desc, (vop_t *) cd9660_access },
{ &vop_getattr_desc, (vop_t *) cd9660_getattr },
{ &vop_inactive_desc, (vop_t *) cd9660_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) vop_null },
{ &vop_reclaim_desc, (vop_t *) cd9660_reclaim },
{ &vop_setattr_desc, (vop_t *) cd9660_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ NULL, NULL }
};
static struct vnodeopv_desc cd9660_fifoop_opv_desc =
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 51148d6..919f2a3 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -147,7 +147,6 @@ static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
{ &vop_getpages_desc, (vop_t *) nfs_getpages },
{ &vop_putpages_desc, (vop_t *) nfs_putpages },
{ &vop_inactive_desc, (vop_t *) nfs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_lease_desc, (vop_t *) vop_null },
{ &vop_link_desc, (vop_t *) nfs_link },
{ &vop_lock_desc, (vop_t *) vop_sharedlock },
@@ -166,7 +165,6 @@ static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
{ &vop_setattr_desc, (vop_t *) nfs_setattr },
{ &vop_strategy_desc, (vop_t *) nfs_strategy },
{ &vop_symlink_desc, (vop_t *) nfs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) nfs_write },
{ NULL, NULL }
};
@@ -184,14 +182,12 @@ static struct vnodeopv_entry_desc nfsv2_specop_entries[] = {
{ &vop_close_desc, (vop_t *) nfsspec_close },
{ &vop_fsync_desc, (vop_t *) nfs_fsync },
{ &vop_getattr_desc, (vop_t *) nfs_getattr },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_inactive_desc, (vop_t *) nfs_inactive },
{ &vop_lock_desc, (vop_t *) vop_sharedlock },
{ &vop_print_desc, (vop_t *) nfs_print },
{ &vop_read_desc, (vop_t *) nfsspec_read },
{ &vop_reclaim_desc, (vop_t *) nfs_reclaim },
{ &vop_setattr_desc, (vop_t *) nfs_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) nfsspec_write },
{ NULL, NULL }
};
@@ -207,13 +203,11 @@ static struct vnodeopv_entry_desc nfsv2_fifoop_entries[] = {
{ &vop_fsync_desc, (vop_t *) nfs_fsync },
{ &vop_getattr_desc, (vop_t *) nfs_getattr },
{ &vop_inactive_desc, (vop_t *) nfs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_lock_desc, (vop_t *) vop_sharedlock },
{ &vop_print_desc, (vop_t *) nfs_print },
{ &vop_read_desc, (vop_t *) nfsfifo_read },
{ &vop_reclaim_desc, (vop_t *) nfs_reclaim },
{ &vop_setattr_desc, (vop_t *) nfs_setattr },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) nfsfifo_write },
{ NULL, NULL }
};
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 932fe45..a4adc9a 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -2676,9 +2676,7 @@ static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = {
{ &vop_create_desc, (vop_t *) ufs_create },
{ &vop_getattr_desc, (vop_t *) ufs_getattr },
{ &vop_inactive_desc, (vop_t *) ufs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_link_desc, (vop_t *) ufs_link },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_lookup_desc, (vop_t *) vfs_cache_lookup },
{ &vop_mkdir_desc, (vop_t *) ufs_mkdir },
{ &vop_mknod_desc, (vop_t *) ufs_mknod },
@@ -2700,7 +2698,6 @@ static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = {
#endif
{ &vop_strategy_desc, (vop_t *) ufs_strategy },
{ &vop_symlink_desc, (vop_t *) ufs_symlink },
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_whiteout_desc, (vop_t *) ufs_whiteout },
#ifdef UFS_EXTATTR
{ &vop_getextattr_desc, (vop_t *) ufs_getextattr },
@@ -2724,8 +2721,6 @@ static struct vnodeopv_entry_desc ufs_specop_entries[] = {
{ &vop_close_desc, (vop_t *) ufsspec_close },
{ &vop_getattr_desc, (vop_t *) ufs_getattr },
{ &vop_inactive_desc, (vop_t *) ufs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ufs_print },
{ &vop_read_desc, (vop_t *) ufsspec_read },
{ &vop_reclaim_desc, (vop_t *) ufs_reclaim },
@@ -2733,7 +2728,6 @@ static struct vnodeopv_entry_desc ufs_specop_entries[] = {
#ifdef MAC
{ &vop_setlabel_desc, (vop_t *) vop_stdsetlabel_ea },
#endif
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ufsspec_write },
#ifdef UFS_EXTATTR
{ &vop_getextattr_desc, (vop_t *) ufs_getextattr },
@@ -2757,9 +2751,7 @@ static struct vnodeopv_entry_desc ufs_fifoop_entries[] = {
{ &vop_close_desc, (vop_t *) ufsfifo_close },
{ &vop_getattr_desc, (vop_t *) ufs_getattr },
{ &vop_inactive_desc, (vop_t *) ufs_inactive },
- { &vop_islocked_desc, (vop_t *) vop_stdislocked },
{ &vop_kqfilter_desc, (vop_t *) ufsfifo_kqfilter },
- { &vop_lock_desc, (vop_t *) vop_stdlock },
{ &vop_print_desc, (vop_t *) ufs_print },
{ &vop_read_desc, (vop_t *) ufsfifo_read },
{ &vop_reclaim_desc, (vop_t *) ufs_reclaim },
@@ -2767,7 +2759,6 @@ static struct vnodeopv_entry_desc ufs_fifoop_entries[] = {
#ifdef MAC
{ &vop_setlabel_desc, (vop_t *) vop_stdsetlabel_ea },
#endif
- { &vop_unlock_desc, (vop_t *) vop_stdunlock },
{ &vop_write_desc, (vop_t *) ufsfifo_write },
#ifdef UFS_EXTATTR
{ &vop_getextattr_desc, (vop_t *) ufs_getextattr },
OpenPOWER on IntegriCloud