Module Name: src
Committed By: riastradh
Date: Mon Apr 20 13:12:24 UTC 2015
Modified Files:
src/sys/nfs: nfs.h
src/sys/sys: vnode.h
Log Message:
Nix LEASE_READ/LEASE_WRITE from <sys/vnode.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/nfs/nfs.h
cvs rdiff -u -r1.250 -r1.251 src/sys/sys/vnode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs.h
diff -u src/sys/nfs/nfs.h:1.74 src/sys/nfs/nfs.h:1.75
--- src/sys/nfs/nfs.h:1.74 Thu Apr 24 18:43:02 2014
+++ src/sys/nfs/nfs.h Mon Apr 20 13:12:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs.h,v 1.74 2014/04/24 18:43:02 christos Exp $ */
+/* $NetBSD: nfs.h,v 1.75 2015/04/20 13:12:24 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -545,8 +545,8 @@ struct nfsrv_descript {
};
/* Bits for "nd_flag" */
-#define ND_READ LEASE_READ
-#define ND_WRITE LEASE_WRITE
+#define ND_READ 0x01 /* Check lease for readers */
+#define ND_WRITE 0x02 /* Check lease for modifiers */
#define ND_CHECK 0x04
#define ND_LEASE (ND_READ | ND_WRITE | ND_CHECK)
#define ND_NFSV3 0x08
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.250 src/sys/sys/vnode.h:1.251
--- src/sys/sys/vnode.h:1.250 Tue Mar 17 09:38:21 2015
+++ src/sys/sys/vnode.h Mon Apr 20 13:12:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.250 2015/03/17 09:38:21 hannken Exp $ */
+/* $NetBSD: vnode.h,v 1.251 2015/04/20 13:12:24 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -385,12 +385,6 @@ extern struct vnode *rootvnode; /* root
extern int desiredvnodes; /* number of vnodes desired */
extern u_int numvnodes; /* current number of vnodes */
-/*
- * Macro/function to check for client cache inconsistency w.r.t. leasing.
- */
-#define LEASE_READ 0x1 /* Check lease for readers */
-#define LEASE_WRITE 0x2 /* Check lease for modifiers */
-
#endif /* _KERNEL */
