Skip to content

Fix random "ERROR_FILE_NOT_FOUND" when unmounting with absolute path #40092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chemwolf6922 merged 3 commits into from
Apr 10, 2026
Merged

Fix random "ERROR_FILE_NOT_FOUND" when unmounting with absolute path #40092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d32ca58
Fix file not found when unmounting with absolute path
chemwolf6922 Apr 3, 2026
a54d67a
Add unit test
chemwolf6922 Apr 7, 2026
324a23b
Merge branch 'master' into user/chemwolf6922/fix-unmount-file-not-found
chemwolf6922 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/windows/common/WslClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,9 +1218,8 @@ int Unmount(_In_ const std::wstring& arg)
wsl::windows::common::SvcComm service;
const HRESULT result = wil::ResultFromException([&] { value = service.DetachDisk(disk); });

// support relative paths in unmount
// check is the result is the error code for "file not found" and the path is relative
if (result == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) && PathIsRelative(disk))
// Retry with the normalized path to handle relative paths and \\?\ prefix mismatches.
if (result == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
Comment thread
chemwolf6922 marked this conversation as resolved.
{
// retry dismounting with the absolute path
const auto absoluteDisk = wsl::windows::common::filesystem::GetFullPath(filesystem::UnquotePath(disk).c_str());
Expand Down
23 changes: 23 additions & 0 deletions test/windows/MountTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,29 @@ class MountTests
VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--unmount " + absolutePath.wstring()), (DWORD)0);
}

TEST_METHOD(AbsolutePathVhdUnmountAfterVMTimeout)
{
SKIP_UNSUPPORTED_ARM64_MOUNT_TEST();
WSL2_TEST_ONLY();

WslKeepAlive keepAlive;

VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--mount " TEST_MOUNT_VHD L" --vhd --bare"), (DWORD)0);

const auto disk = GetBlockDeviceInWsl();
VERIFY_IS_TRUE(IsBlockDevicePresent(disk));

WaitForVmTimeout(keepAlive);

const auto absolutePath = std::filesystem::absolute(TEST_MOUNT_VHD);

// Validate that the vhd path doesn't start with '\\?'
VERIFY_IS_FALSE(absolutePath.wstring().starts_with(L"\\"));

// Validate the unmounting by absolute path is successful
VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"--unmount " + absolutePath.wstring()), (DWORD)0);
Comment thread
chemwolf6922 marked this conversation as resolved.
}

// Attach a disk, but don't mount it
TEST_METHOD(TestBareMount)
{
Expand Down
Loading