actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pass -l flag to umount

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-24 22:46:18 +00:00
parent 389c5e4430
commit d8e675a1c4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+10 -7
View File
@@ -242,7 +242,7 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
FILEMAN->Unmount( "dir", d.sOsMountDir, TEMP_MOUNT_POINT ); FILEMAN->Unmount( "dir", d.sOsMountDir, TEMP_MOUNT_POINT );
} }
ExecuteCommand( "umount " + d.sOsMountDir ); ExecuteCommand( "umount -l \"" + d.sOsMountDir + "\"" );
LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_ERROR? "failed":"succeeded", d.sName.c_str() ); LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_ERROR? "failed":"succeeded", d.sName.c_str() );
} }
@@ -491,10 +491,9 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
bool MemoryCardDriverThreaded_Linux::Mount( UsbStorageDevice* pDevice ) bool MemoryCardDriverThreaded_Linux::Mount( UsbStorageDevice* pDevice )
{ {
ASSERT( !pDevice->sOsMountDir.empty() ); ASSERT( !pDevice->sDevice.empty() );
CString sCommand = "mount " + pDevice->sDevice; CString sCommand = "mount " + pDevice->sDevice;
LOG->Trace( "hack mount (%s)", sCommand.c_str() );
bool bMountedSuccessfully = ExecuteCommand( sCommand ); bool bMountedSuccessfully = ExecuteCommand( sCommand );
return bMountedSuccessfully; return bMountedSuccessfully;
@@ -502,17 +501,21 @@ bool MemoryCardDriverThreaded_Linux::Mount( UsbStorageDevice* pDevice )
void MemoryCardDriverThreaded_Linux::Unmount( UsbStorageDevice* pDevice ) void MemoryCardDriverThreaded_Linux::Unmount( UsbStorageDevice* pDevice )
{ {
if( pDevice->sOsMountDir.empty() ) if( pDevice->sDevice.empty() )
return; return;
CString sCommand = "umount " + pDevice->sDevice; /* Use umount -l, so we unmount the device even if it's in use. Open
LOG->Trace( "hack unmount (%s)", sCommand.c_str() ); * files remain usable, and the device (eg. /dev/sda) won't be reused
* by new devices until those are closed. Without this, if something
* causes the device to not unmount here, we'll never unmount it; that
* causes a device name leak, eventually running us out of mountpoints. */
CString sCommand = "umount -l \"" + pDevice->sDevice + "\"";
ExecuteCommand( sCommand ); ExecuteCommand( sCommand );
} }
void MemoryCardDriverThreaded_Linux::Flush( UsbStorageDevice* pDevice ) void MemoryCardDriverThreaded_Linux::Flush( UsbStorageDevice* pDevice )
{ {
if( pDevice->sOsMountDir.empty() ) if( pDevice->sDevice.empty() )
return; return;
// "sync" will only flush all file systems at the same time. -Chris // "sync" will only flush all file systems at the same time. -Chris