1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00

Undo 1.29.

This commit is contained in:
KATO Takenori 1997-04-27 10:49:37 +00:00
parent d75a8fdbb1
commit c4ace78562
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=25192
2 changed files with 4 additions and 4 deletions

View File

@ -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 @@ union_lock(ap)
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)

View File

@ -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 @@ union_lock(ap)
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)