Properly unlock on mount failure
This commit is contained in:
parent
5cbbfc69e7
commit
26d359a30c
1 changed files with 16 additions and 7 deletions
|
@ -237,20 +237,27 @@ char mount_label[LABEL_MAX] )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX: move this upwards before lookup after proper locking. */
|
|
||||||
/* We'll need a vnode for the root inode */
|
/* We'll need a vnode for the root inode */
|
||||||
if ((root_node = get_free_vnode()) == NULL || dev == 266) {
|
if ((root_node = get_free_vnode()) == NULL || dev == 266) {
|
||||||
|
if (vp != NULL) {
|
||||||
unlock_vnode(vp);
|
unlock_vnode(vp);
|
||||||
unlock_vmnt(new_vmp);
|
|
||||||
put_vnode(vp);
|
put_vnode(vp);
|
||||||
|
}
|
||||||
|
unlock_vmnt(new_vmp);
|
||||||
return(err_code);
|
return(err_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
lock_vnode(root_node, VNODE_OPCL);
|
lock_vnode(root_node, VNODE_OPCL);
|
||||||
|
|
||||||
/* Record process as a system process */
|
/* Record process as a system process */
|
||||||
if (isokendpt(fs_e, &slot) != OK)
|
if (isokendpt(fs_e, &slot) != OK) {
|
||||||
|
if (vp != NULL) {
|
||||||
|
unlock_vnode(vp);
|
||||||
|
put_vnode(vp);
|
||||||
|
}
|
||||||
|
unlock_vnode(root_node);
|
||||||
|
unlock_vmnt(new_vmp);
|
||||||
return(EINVAL);
|
return(EINVAL);
|
||||||
|
}
|
||||||
rfp = &fproc[slot];
|
rfp = &fproc[slot];
|
||||||
rfp->fp_flags |= FP_SYS_PROC; /* Process is an FS */
|
rfp->fp_flags |= FP_SYS_PROC; /* Process is an FS */
|
||||||
|
|
||||||
|
@ -269,9 +276,11 @@ char mount_label[LABEL_MAX] )
|
||||||
new_vmp->m_fs_e = NONE;
|
new_vmp->m_fs_e = NONE;
|
||||||
new_vmp->m_dev = NO_DEV;
|
new_vmp->m_dev = NO_DEV;
|
||||||
unlock_vnode(root_node);
|
unlock_vnode(root_node);
|
||||||
|
if (vp != NULL) {
|
||||||
unlock_vnode(vp);
|
unlock_vnode(vp);
|
||||||
unlock_vmnt(new_vmp);
|
|
||||||
put_vnode(vp);
|
put_vnode(vp);
|
||||||
|
}
|
||||||
|
unlock_vmnt(new_vmp);
|
||||||
return(r);
|
return(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue