--- a/userlibandfileserver/fileserver/sfile/sf_thread.cpp	Tue Sep 14 23:56:21 2010 +0300
+++ b/userlibandfileserver/fileserver/sfile/sf_thread.cpp	Wed Sep 15 13:42:27 2010 +0300
@@ -858,15 +858,7 @@
 	TDrive& drive = TheDrives[self.iDriveNumber];
 	if(drive.IsMounted())
         {
-        if (drive.CurrentMount().LockStatus() == 0)
-            {
-            // Ignore the error here, as there's nothing we can do about it...
-            (void)drive.FinaliseMount(RFs::EFinal_RW);
-            }
-        else
-            {
-            self.StartFinalisationTimer();
-            }
+        (void)drive.FinaliseMount(RFs::EFinal_RW);
         }
 
 	return KErrNone;
@@ -929,14 +921,14 @@
   : iPlugin(aPlugin)
 	{
 	/** @prototype */
-	iOperationLock.Close();
 	iPlugin.Open();
 	}
 
 CPluginThread::~CPluginThread()
-    {
-    iPlugin.Close();
-    }
+	{
+	iPlugin.Close();
+	iOperationLock.Close();
+	}
 
 
 CPluginThread* CPluginThread::NewL(CFsPlugin& aPlugin)