oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly unlock on mount failure

Browse Source
This commit is contained in:
Thomas Veerman 2011-12-09 15:47:42 +00:00
parent 5cbbfc69e7
commit 26d359a30c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/avfs/mount.c
View File

@ -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) {
unlock_vnode(vp); if (vp != NULL) {
unlock_vnode(vp);
put_vnode(vp);
}
unlock_vmnt(new_vmp); unlock_vmnt(new_vmp);
put_vnode(vp);
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);
unlock_vnode(vp); if (vp != NULL) {
unlock_vnode(vp);
put_vnode(vp);
}
unlock_vmnt(new_vmp); unlock_vmnt(new_vmp);
put_vnode(vp);
return(r); return(r);
} }