summaryrefslogtreecommitdiff
path: root/sys/msdosfs
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2007-01-16 17:52:19 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2007-01-16 17:52:19 +0000
commit2de0712790ae7c9f1ad5fbd4d16115b50d00b964 (patch)
tree9dd89d25cc512e0f21c86d0d63e7b0d60a9a5290 /sys/msdosfs
parent4bd808e5f53e0cc7725f8c6e49c7cdf716a77be4 (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/msdosfs')
-rw-r--r--sys/msdosfs/denode.h8
-rw-r--r--sys/msdosfs/msdosfs_vnops.c3
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index 827433ac702..dd8d992ce57 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: denode.h,v 1.18 2005/03/01 14:24:33 tom Exp $ */
+/* $OpenBSD: denode.h,v 1.19 2007/01/16 17:52:18 thib Exp $ */
/* $NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $ */
/*-
@@ -268,12 +268,6 @@ int msdosfs_getattr(void *);
int msdosfs_setattr(void *);
int msdosfs_read(void *);
int msdosfs_write(void *);
-#ifdef NFSSERVER
-int lease_check(void *);
-#define msdosfs_lease_check lease_check
-#else
-#define msdosfs_lease_check nullop
-#endif
int msdosfs_ioctl(void *);
int msdosfs_poll(void *);
int msdosfs_fsync(void *);
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 14c457320d9..3930d00277e 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vnops.c,v 1.58 2006/10/16 11:27:53 pedro Exp $ */
+/* $OpenBSD: msdosfs_vnops.c,v 1.59 2007/01/16 17:52:18 thib Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */
/*-
@@ -1977,7 +1977,6 @@ struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
{ &vop_setattr_desc, msdosfs_setattr }, /* setattr */
{ &vop_read_desc, msdosfs_read }, /* read */
{ &vop_write_desc, msdosfs_write }, /* write */
- { &vop_lease_desc, msdosfs_lease_check }, /* lease */
{ &vop_ioctl_desc, msdosfs_ioctl }, /* ioctl */
{ &vop_poll_desc, msdosfs_poll }, /* poll */
{ &vop_fsync_desc, msdosfs_fsync }, /* fsync */