summaryrefslogtreecommitdiffstats
path: root/sys/fs/unionfs/union.h
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-02-10 03:32:07 +0000
committerkato <kato@FreeBSD.org>1998-02-10 03:32:07 +0000
commit50af713bea84392927504d5a94f3ca83271b5946 (patch)
tree0e7101898990483565ae6b38b3fba7e769536ecc /sys/fs/unionfs/union.h
parent0c1ad0fcbbe4368c531b3e63d49f7288a2ff8549 (diff)
downloadFreeBSD-src-50af713bea84392927504d5a94f3ca83271b5946.zip
FreeBSD-src-50af713bea84392927504d5a94f3ca83271b5946.tar.gz
Undo UN_KLOCK hack except union_allocvp(). Now, vput() doesn't lock
the vnode.
Diffstat (limited to 'sys/fs/unionfs/union.h')
-rw-r--r--sys/fs/unionfs/union.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index f3bbb89..442fc95 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union.h 8.9 (Berkeley) 12/10/94
- * $Id: union.h,v 1.9 1997/11/18 15:07:34 phk Exp $
+ * $Id: union.h,v 1.10 1998/01/20 10:02:50 kato Exp $
*/
struct union_args {
@@ -93,9 +93,10 @@ struct union_node {
#define UN_ULOCK 0x04 /* Upper node is locked */
#define UN_KLOCK 0x08 /* Keep upper node locked on vput */
#define UN_CACHED 0x10 /* In union cache */
+#define UN_GLOCK 0x20 /* Keep upper node locked on vget */
-#define SETKLOCK(un) (un)->un_flags |= UN_KLOCK
-#define CLEARKLOCK(un) (un)->un_flags &= ~UN_KLOCK
+#define SETGLOCK(un) (un)->un_flags |= UN_GLOCK
+#define CLEARGLOCK(un) (un)->un_flags &= ~UN_GLOCK
extern int union_allocvp __P((struct vnode **, struct mount *,
struct vnode *, struct vnode *,
OpenPOWER on IntegriCloud