[src/trunk]: src/sys Nix LEASE_READ/LEASE_WRITE from <sys/vnode.h>.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80938c06a01a
branches:  trunk
changeset: 337571:80938c06a01a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 20 13:12:24 2015 +0000

description:
Nix LEASE_READ/LEASE_WRITE from <sys/vnode.h>.

diffstat:

 sys/nfs/nfs.h   |  6 +++---
 sys/sys/vnode.h |  8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (42 lines):

diff -r ff2040ab34d7 -r 80938c06a01a sys/nfs/nfs.h
--- a/sys/nfs/nfs.h     Mon Apr 20 12:41:38 2015 +0000
+++ b/sys/nfs/nfs.h     Mon Apr 20 13:12:24 2015 +0000
@@ -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 @@
 };
 
 /* 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
diff -r ff2040ab34d7 -r 80938c06a01a sys/sys/vnode.h
--- a/sys/sys/vnode.h   Mon Apr 20 12:41:38 2015 +0000
+++ b/sys/sys/vnode.h   Mon Apr 20 13:12:24 2015 +0000
@@ -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 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 */