sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce block special file (thread) lock scope

Browse source
This commit is contained in:
Thomas Veerman 2011-08-22 11:48:16 +00:00
parent 55d926cbaa
commit 68011701bd
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/avfs/mount.c
View file

@ -404,7 +404,9 @@ PUBLIC int do_umount(void)
if ((dev = name_to_dev(TRUE /*allow_mountpt*/, fullpath)) == NO_DEV) if ((dev = name_to_dev(TRUE /*allow_mountpt*/, fullpath)) == NO_DEV)
return(err_code); return(err_code);
if ((r = unmount(dev, label)) != OK) return(r); if ((r = unmount(dev, label)) != OK) { verbose2=0; verbose_e = NONE; return(r); }
verbose2 = 0;
verbose_e = NONE;
/* Return the label of the mounted file system, so that the caller /* Return the label of the mounted file system, so that the caller
* can shut down the corresponding server process. * can shut down the corresponding server process.
@ -439,12 +441,9 @@ PUBLIC int unmount(
/* Did we find the vmnt (i.e., was dev a mounted device)? */ /* Did we find the vmnt (i.e., was dev a mounted device)? */
if(!vmp) return(EINVAL); if(!vmp) return(EINVAL);
lock_bsf(); verbose2=1;
verbose_e = vmp->m_fs_e;
if ((r = lock_vmnt(vmp, VMNT_EXCL)) != OK) { if ((r = lock_vmnt(vmp, VMNT_EXCL)) != OK) return(r);
unlock_bsf();
return(r);
}
/* See if the mounted device is busy. Only 1 vnode using it should be /* See if the mounted device is busy. Only 1 vnode using it should be
* open -- the root vnode -- and that inode only 1 time. */ * open -- the root vnode -- and that inode only 1 time. */
@ -457,7 +456,6 @@ PUBLIC int unmount(
if (count > 1 || locks > 1) { if (count > 1 || locks > 1) {
unlock_vmnt(vmp); unlock_vmnt(vmp);
unlock_bsf();
return(EBUSY); /* can't umount a busy file system */ return(EBUSY); /* can't umount a busy file system */
} }
@ -491,11 +489,13 @@ PUBLIC int unmount(
vmp->m_dev = NO_DEV; vmp->m_dev = NO_DEV;
vmp->m_fs_e = NONE; vmp->m_fs_e = NONE;
/* The root FS will handle block I/O requests for this device now. */
update_bspec(dev, ROOT_FS_E, 1 /* send new driver endpoint */);
unlock_vmnt(vmp); unlock_vmnt(vmp);
/* The root FS will handle block I/O requests for this device now. */
lock_bsf();
update_bspec(dev, ROOT_FS_E, 1 /* send new driver endpoint */);
unlock_bsf(); unlock_bsf();
return(OK); return(OK);
} }