Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NTFS: Fetch the mount point path during initialization.

Browse Source 
Fixes #18490.

Change-Id: I06d4b268f2088ac49ef3bc5d895ab94f219e2177
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6741
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2023-07-24 15:29:45 -04:00 committed by waddlesplash
parent 387fe2d9a7
commit 8b018d9a9f
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp
View File

@ -14,6 +14,7 @@
#include <AutoDeleter.h> #include <AutoDeleter.h>
#include <fs_cache.h> #include <fs_cache.h>
#include <fs_info.h> #include <fs_info.h>
#include <vfs.h>
#include <NodeMonitor.h> #include <NodeMonitor.h>
#include <file_systems/DeviceOpener.h> #include <file_systems/DeviceOpener.h>
#include <file_systems/fs_ops_support.h> #include <file_systems/fs_ops_support.h>
@ -190,6 +191,24 @@ fs_mount(fs_volume* _volume, const char* device, uint32 flags,
return B_ERROR; return B_ERROR;
} }
// Fetch mount path, used when reading NTFS symlinks.
dev_t deviceID;
ino_t nodeID;
status_t status = vfs_get_mount_point(_volume->id, &deviceID, &nodeID);
char* mountpoint;
if (status == B_OK) {
mountpoint = (char*)malloc(PATH_MAX);
status = vfs_entry_ref_to_path(deviceID, nodeID, NULL, true,
mountpoint, PATH_MAX);
if (status == B_OK) {
char* reallocated = (char*)realloc(mountpoint, strlen(mountpoint) + 1);
if (reallocated != NULL)
mountpoint = reallocated;
}
}
if (status != B_OK)
mountpoint = strdup("");
// TODO: uid/gid mapping and real permissions // TODO: uid/gid mapping and real permissions
// construct lowntfs_context // construct lowntfs_context
@ -197,7 +216,7 @@ fs_mount(fs_volume* _volume, const char* device, uint32 flags,
volume->lowntfs.current_close_state_vnode = NULL; volume->lowntfs.current_close_state_vnode = NULL;
volume->lowntfs.vol = volume->ntfs; volume->lowntfs.vol = volume->ntfs;
volume->ntfs->abs_mnt_point = volume->lowntfs.abs_mnt_point = strdup(""); volume->ntfs->abs_mnt_point = volume->lowntfs.abs_mnt_point = mountpoint;
volume->lowntfs.dmask = 0; volume->lowntfs.dmask = 0;
volume->lowntfs.fmask = S_IXUSR | S_IXGRP | S_IXOTH; volume->lowntfs.fmask = S_IXUSR | S_IXGRP | S_IXOTH;
volume->lowntfs.dmtime = 0; volume->lowntfs.dmtime = 0;
@ -213,7 +232,7 @@ fs_mount(fs_volume* _volume, const char* device, uint32 flags,
root->uid = root->gid = 0; root->uid = root->gid = 0;
root->size = 0; root->size = 0;
status_t status = publish_vnode(_volume, root->inode, root, &gNtfsVnodeOps, S_IFDIR, 0); status = publish_vnode(_volume, root->inode, root, &gNtfsVnodeOps, S_IFDIR, 0);
if (status != B_OK) { if (status != B_OK) {
ntfs_umount(volume->ntfs, true); ntfs_umount(volume->ntfs, true);
return status; return status;