i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntfs: Actually return errors from fs_mount.

Browse Source 
This should fix the "mount succeeded but ops is NULL!" panic that
occurs on auto-mounting read-only NTFS disks on boot.
This commit is contained in:
Augustin Cavalier
2018-12-26 17:30:28 -05:00
parent 30d69e3f5e
commit b5ccfd350d
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/fs_func.c
+3 -11
View File
@@ -355,10 +355,8 @@ fs_mount(fs_volume *_vol, const char *device, uint32 flags, const char *args,
TRACE("fs_mount - ENTER\n"); TRACE("fs_mount - ENTER\n");
ns = ntfs_malloc(sizeof(nspace)); ns = ntfs_malloc(sizeof(nspace));
if (!ns) { if (ns == NULL)
result = ENOMEM; return ENOMEM;
goto exit;
}
*ns = (nspace) { *ns = (nspace) {
.state = NF_FreeClustersOutdate | NF_FreeMFTOutdate, .state = NF_FreeClustersOutdate | NF_FreeMFTOutdate,
@@ -444,7 +442,6 @@ fs_mount(fs_volume *_vol, const char *device, uint32 flags, const char *args,
if (result != B_NO_ERROR) { if (result != B_NO_ERROR) {
free(ns); free(ns);
result = EINVAL; result = EINVAL;
goto exit;
} else { } else {
result = B_NO_ERROR; result = B_NO_ERROR;
ntfs_mark_free_space_outdated(ns); ntfs_mark_free_space_outdated(ns);
@@ -454,12 +451,7 @@ fs_mount(fs_volume *_vol, const char *device, uint32 flags, const char *args,
} else } else
free(ns); free(ns);
TRACE("fs_mount - EXIT\n"); TRACE("fs_mount - EXIT, result code is %s\n", strerror(result));
return B_OK;
exit:
ERROR("fs_mount - EXIT, result code is %s\n", strerror(result));
return result; return result;
} }