diff options
| author | kato <kato@FreeBSD.org> | 1997-08-15 02:35:00 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-08-15 02:35:00 +0000 |
| commit | 8f18798bdfa9536300d60846b2d1a33afbc9c983 (patch) | |
| tree | f0bcd325fbfb8ac2e45d2925b4e2fb89b10eb320 /sys/miscfs | |
| parent | 79155dd8713a7b791bda0ae6c90dc5ed289457fe (diff) | |
| download | FreeBSD-src-8f18798bdfa9536300d60846b2d1a33afbc9c983.zip FreeBSD-src-8f18798bdfa9536300d60846b2d1a33afbc9c983.tar.gz | |
Deleted unused code which adjust UN_UNLOCK flag.
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/union/union_vnops.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index d8cb8ee..c6b59f0 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id: union_vnops.c,v 1.35 1997/08/12 07:18:59 kato Exp $ + * $Id: union_vnops.c,v 1.36 1997/08/14 03:52:27 kato Exp $ */ #include <sys/param.h> @@ -1499,22 +1499,10 @@ start: if (un->un_uppervp != NULLVP) { if (((un->un_flags & (UN_ULOCK | UN_KLOCK)) == 0) && (vp->v_usecount != 0)) { - if (0 && VOP_ISLOCKED(un->un_uppervp)) { - /* - * XXX - * Erm, we find race! - */ -#ifdef DIAGNOSTIC - panic("union_lock: upper vnode is locked, " - "but UN_UNLOCK is not set."); -#endif - un->un_flags |= UN_ULOCK; - } else { - error = vn_lock(un->un_uppervp, flags, p); - if (error) - return (error); - un->un_flags |= UN_ULOCK; - } + error = vn_lock(un->un_uppervp, flags, p); + if (error) + return (error); + un->un_flags |= UN_ULOCK; } } |
