I'm tired of having a 'hanging root device'.. This isn't a "fix", just

a workaround for a specific case where cam interrupts right in the middle
of this printf.
This commit is contained in:
Peter Wemm 1999-06-26 14:44:24 +00:00
parent 25d210e317
commit fec1aafc01
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=48249
2 changed files with 8 additions and 2 deletions

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.27 1999/05/23 10:51:33 jb Exp $ * $Id: vfs_conf.c,v 1.28 1999/05/24 00:37:26 jb Exp $
*/ */
/* /*
@ -118,6 +118,7 @@ vfs_mountrootfs(void *unused)
struct mount *mp; struct mount *mp;
int err; int err;
struct proc *p = curproc; /* XXX */ struct proc *p = curproc; /* XXX */
int s;
int i; int i;
dev_t orootdev; dev_t orootdev;
@ -146,7 +147,9 @@ vfs_mountrootfs(void *unused)
break; break;
rootdev = rootdevs[i]; rootdev = rootdevs[i];
if (rootdev != orootdev) { if (rootdev != orootdev) {
s = splbio(); /* Overkill, but harmless.. */
printf("changing root device to %s\n", rootdevnames[i]); printf("changing root device to %s\n", rootdevnames[i]);
splx(s);
orootdev = rootdev; orootdev = rootdev;
} }
strncpy(mp->mnt_stat.f_mntfromname, strncpy(mp->mnt_stat.f_mntfromname,

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.27 1999/05/23 10:51:33 jb Exp $ * $Id: vfs_conf.c,v 1.28 1999/05/24 00:37:26 jb Exp $
*/ */
/* /*
@ -118,6 +118,7 @@ vfs_mountrootfs(void *unused)
struct mount *mp; struct mount *mp;
int err; int err;
struct proc *p = curproc; /* XXX */ struct proc *p = curproc; /* XXX */
int s;
int i; int i;
dev_t orootdev; dev_t orootdev;
@ -146,7 +147,9 @@ vfs_mountrootfs(void *unused)
break; break;
rootdev = rootdevs[i]; rootdev = rootdevs[i];
if (rootdev != orootdev) { if (rootdev != orootdev) {
s = splbio(); /* Overkill, but harmless.. */
printf("changing root device to %s\n", rootdevnames[i]); printf("changing root device to %s\n", rootdevnames[i]);
splx(s);
orootdev = rootdev; orootdev = rootdev;
} }
strncpy(mp->mnt_stat.f_mntfromname, strncpy(mp->mnt_stat.f_mntfromname,