diff options
| author | kato <kato@FreeBSD.org> | 1997-04-27 10:49:37 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-04-27 10:49:37 +0000 |
| commit | 80b711702c469523ed9e3a6fb21fa9f19e161396 (patch) | |
| tree | f2cd39731cfa5fb77439a25b8ec89581e5588962 /sys/miscfs | |
| parent | a04669c796650a51df44d84793f6e8aa684b4388 (diff) | |
| download | FreeBSD-src-80b711702c469523ed9e3a6fb21fa9f19e161396.zip FreeBSD-src-80b711702c469523ed9e3a6fb21fa9f19e161396.tar.gz | |
Undo 1.29.
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/union/union_vnops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index f80a07f..f8c8293 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.28 1997/04/26 04:09:40 kato Exp $ + * $Id: union_vnops.c,v 1.29 1997/04/26 13:43:25 kato Exp $ */ #include <sys/param.h> @@ -1480,12 +1480,12 @@ start: if (VOP_ISLOCKED(un->un_uppervp)) { /* * Erm, we find race! - * Do nothing here. */ #ifdef DIAGNOSTIC panic("union_link: upper vnode is locked, " "but UN_UNLOCK is not set."); #endif + un->un_flags |= UN_ULOCK; /* XXX */ } else { error = vn_lock(un->un_uppervp, flags, p); if (error) |
