d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't worry if a module is already loaded when looking for a fstype to mount

Browse Source 
(possible in a race condition).

Reviewed by:	kib
MFC after:	1 week
This commit is contained in:
Jamie Gritton 2013-02-21 02:41:37 +00:00
parent 62c658aa9f
commit ffc72591b1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_init.c
View File

@ -122,7 +122,7 @@ struct vfsconf *
vfs_byname_kld(const char *fstype, struct thread *td, int *error)
{
struct vfsconf *vfsp;
int fileid;
int fileid, loaded;
vfsp = vfs_byname(fstype);
if (vfsp != NULL)
@ -130,13 +130,17 @@ vfs_byname_kld(const char *fstype, struct thread *td, int *error)
/* Try to load the respective module. */
*error = kern_kldload(td, fstype, &fileid);
loaded = (*error == 0);
if (*error == EEXIST)
*error = 0;
if (*error)
return (NULL);
/* Look up again to see if the VFS was loaded. */
vfsp = vfs_byname(fstype);
if (vfsp == NULL) {
(void)kern_kldunload(td, fileid, LINKER_UNLOAD_FORCE);
if (loaded)
(void)kern_kldunload(td, fileid, LINKER_UNLOAD_FORCE);
*error = ENODEV;
return (NULL);
}