diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-01-16 17:52:19 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-01-16 17:52:19 +0000 |
| commit | 2de0712790ae7c9f1ad5fbd4d16115b50d00b964 (patch) | |
| tree | 9dd89d25cc512e0f21c86d0d63e7b0d60a9a5290 /sys/ufs | |
| parent | 4bd808e5f53e0cc7725f8c6e49c7cdf716a77be4 (diff) | |
Retire VOP_LEASE(); It was a bit for NQNFS and has
effectively been a no-op for quite some time now,
without promise for future usage.
ok pedro@
Testing by krw@ (earlier diff)
and Johan Mson Lindman (tybollt@solace.miun.se)
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 3 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 3 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_extern.h | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index a5fb2cdb455..6c3ba4e44a5 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.44 2006/01/09 12:43:17 pedro Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.45 2007/01/16 17:52:18 thib Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -1371,7 +1371,6 @@ struct vnodeopv_entry_desc ext2fs_vnodeop_entries[] = { { &vop_setattr_desc, ext2fs_setattr }, /* setattr */ { &vop_read_desc, ext2fs_read }, /* read */ { &vop_write_desc, ext2fs_write }, /* write */ - { &vop_lease_desc, ufs_lease_check }, /* lease */ { &vop_ioctl_desc, ufs_ioctl }, /* ioctl */ { &vop_poll_desc, ufs_poll }, /* poll */ { &vop_kqfilter_desc, vop_generic_kqfilter }, /* kqfilter */ diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 6d9035e88fa..c0c8f9ecd42 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.40 2007/01/13 17:41:55 thib Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.41 2007/01/16 17:52:18 thib Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -76,7 +76,6 @@ struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { { &vop_setattr_desc, ufs_setattr }, /* setattr */ { &vop_read_desc, ffs_read }, /* read */ { &vop_write_desc, ffs_write }, /* write */ - { &vop_lease_desc, ufs_lease_check }, /* lease */ { &vop_ioctl_desc, ufs_ioctl }, /* ioctl */ { &vop_poll_desc, ufs_poll }, /* poll */ { &vop_kqfilter_desc, ufs_kqfilter }, /* kqfilter */ diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 997b9e978fc..6ffb6f788a5 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_extern.h,v 1.26 2006/10/03 19:49:06 pedro Exp $ */ +/* $OpenBSD: ufs_extern.h,v 1.27 2007/01/16 17:52:18 thib Exp $ */ /* $NetBSD: ufs_extern.h,v 1.5 1996/02/09 22:36:03 christos Exp $ */ /*- @@ -63,12 +63,6 @@ int ufs_getattr(void *); int ufs_inactive(void *); int ufs_ioctl(void *); int ufs_islocked(void *); -#ifdef NFSSERVER -int lease_check(void *); -#define ufs_lease_check lease_check -#else -#define ufs_lease_check ((int (*)(void *))nullop) -#endif int ufs_link(void *); int ufs_lock(void *); int ufs_lookup(void *); |