--- a/userlibandfileserver/fileserver/sfile/sf_std.h	Wed May 05 05:11:16 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_std.h	Mon May 10 11:40:53 2010 +0100
@@ -144,6 +144,13 @@
 //-- absolute maximum file size that file server supports
 const TUint64 KMaxSupportedFileSize = KMaxTUint64;
 
+//-- this is a speculative value of a min. amount of free space on the volume necessary to create a file, directory etc.
+//-- it is used mostly in "reserve drive space" functionality, which is, actually, fundamentally flawed.
+//-- the problem is that the file server can't know exactly how much space is required to create some fs object on the volume, 
+//-- so, it has to guess. This is a default "sector size" value; the file system can round it up internally to its cluster size if any.
+const TInt KMinFsCreateObjTreshold = KDefaultVolumeBlockSize;
+
+
 //__DATA_CAGING__
 const TUint SHA1_LBLOCK=16;
 const TUint SHA1_HASH=20;
@@ -235,7 +242,7 @@
 
 enum TFsPanic
 	{
-	ELdrImportedOrdinalDoesNotExist
+	ELdrImportedOrdinalDoesNotExist	
 	};
 //
 enum TFsFault
@@ -443,7 +450,8 @@
 	ETraceLddLoadFailure,				//200
 	ETooManyDrivesPerSocket,
 	ENotificationFault,
-	EFsObjectOpen
+	EFsObjectOpen,
+	EContainerHeapCorruptionOnRemove
 	};
 
 
@@ -1838,10 +1846,6 @@
 
 typedef TPckgBuf<TMediaPswdReplyNotifyInfoV1> TMediaPswdReplyNotifyInfoV1Buf;
 
-#if defined(__WINS__)
- TInt MapWindowsFileName(TDes& aBuffer,const TDesC& aFileName);
-#endif
-
 enum TDllFindMethod {EFindInPath, EFindInSystemLibs, EFindInSystemBin, EFindExhausted};
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -1867,6 +1871,7 @@
 	TInt iFairSchedulingLen;
 	TBool iNotifyAsyncReadersPending;
 	TBool iDeleteOnClose;
+	TDblQue<CFileShare> iShareList;	// A list containing the CFileShare objects associated with the file
 
 protected:
 	TInt iPromotedShares;
@@ -1876,11 +1881,14 @@
 
     /** 
     maximum file size supported by the filesystem that instantiates the CFileCB, associated with this object.
-    For example, FAT32 supports files not larger than 4GB-1. Other file systems can support larger files. 
+    For example, FAT32 supports files not larger than 4GB-1. Other file systems can support larger files.
     This member allows file server to know maximum allowed position in the file.
     The default value is KMaxTUint64
     */
-    TUint64 iMaxSupportedFileSize; 
+    TUint64 iMaxSupportedFileSize;
+    
+    TInt iNonSequentialFileModes;	// Count of clients without the 'Sequential' mode enabled
+	TBool iSequential;				// Indicates whether the file is in 'Sequential' mode
 
 public:
 	// Provides support for large file size ( file size > 4GB - 1)