Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaropund fix for PR #5239 from <minoura@kw.netlaputa.ne.jp>:

Browse Source 
stop  null_node_create() from locking the nullfs mountpoint  multiple
  times. Avoids a guaranteed, repeatably "locking against myself" panic
  during mount of a nullfs filesystem.  nullfs filesystems are still as
  buggy as ever (e.g., see PR# 4907) but this you at least mount them.
This commit is contained in:
jonathan 1998-09-30 06:50:10 +00:00
parent 59a88e1c7f
commit fcf7a78c02
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/miscfs/nullfs/null_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: null_subr.c,v 1.12 1998/03/11 15:52:02 fvdl Exp $ */
/* $NetBSD: null_subr.c,v 1.13 1998/09/30 06:50:10 jonathan Exp $ */
/*
* Copyright (c) 1992, 1993
@ -250,6 +250,7 @@ null_node_create(mp, lowervp, newvpp, takelock)
int takelock;
{
struct vnode *aliasvp;
int locked = 0;
if ((aliasvp = null_node_find(mp, lowervp)) != NULL) {
/*
@ -279,6 +280,7 @@ null_node_create(mp, lowervp, newvpp, takelock)
/*
* aliasvp is already VREF'd by getnewvnode()
*/
locked = 1;
}
vrele(lowervp);
@ -298,9 +300,14 @@ null_node_create(mp, lowervp, newvpp, takelock)
/* lower node was locked: mark it as locked and take
upper layer lock */
VTONULL(aliasvp)->null_flags |= NULL_LLOCK;
if (takelock)
vn_lock(aliasvp, LK_EXCLUSIVE | LK_RETRY);
if (takelock) {
if (!locked)
vn_lock(aliasvp, LK_EXCLUSIVE | LK_RETRY);
#if defined(DIAGNOSTIC) || defined(DEBUG) || defined(NULLFS_DIAGNOSTIC)
else
printf ("null_node_create: already locked\n");
#endif
}
*newvpp = aliasvp;
return (0);
}