diff -r 75252ea6123b -r c7a0ce20c48c userlibandfileserver/fileserver/sfile/sf_plugin_ops.cpp --- a/userlibandfileserver/fileserver/sfile/sf_plugin_ops.cpp Mon Jul 26 10:52:56 2010 +0100 +++ b/userlibandfileserver/fileserver/sfile/sf_plugin_ops.cpp Fri Aug 06 16:34:38 2010 +0100 @@ -153,7 +153,7 @@ if(pF->IsDriveSupported(drive) == EFalse) return KErrNotSupported; - FsPluginManager::LockChain(); + FsPluginManager::ReadLockChain(); err = FsPluginManager::IsInChain(pF->UniquePosition(),aRequest->Message().Int2(),aRequest->Message().Int1(), pF); // plugin might have been mounted in different pos and drive. Find the right one @@ -209,7 +209,7 @@ TInt drive = aRequest->Message().Int1(); - FsPluginManager::LockChain(); + FsPluginManager::WriteLockChain(); TInt err = FsPluginManager::IsInChain(pF->UniquePosition(),aRequest->Message().Int2(),drive, pF); if(err >= 0) @@ -219,11 +219,8 @@ err = FsPluginManager::Plugin(plugin, pos); if(err == KErrNone) { - if(aRequest->iCurrentPlugin == plugin) - { - FsPluginManager::DismountPlugin(*pF,pos); - aRequest->SetScratchValue(0); - } + FsPluginManager::DismountPlugin(*pF,pos); + aRequest->SetScratchValue(0); } } FsPluginManager::UnlockChain(); @@ -250,7 +247,7 @@ TInt TFsPluginName::DoRequestL(CFsRequest* aRequest) { CFsPlugin* plugin=NULL; - FsPluginManager::LockChain(); + FsPluginManager::ReadLockChain(); TInt err = FsPluginManager::Plugin(plugin, aRequest->Message().Int2()); if(err != KErrNone) //should be ok but just in case {