--- a/userlibandfileserver/fileserver/sfile/sf_thread.cpp	Mon Sep 13 15:16:07 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_thread.cpp	Wed Sep 22 10:53:45 2010 +0100
@@ -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;