diff -r 95f71bcdcdb7 -r 657f875b013e userlibandfileserver/fileserver/sfile/sf_std.h --- a/userlibandfileserver/fileserver/sfile/sf_std.h Thu May 27 14:17:14 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_std.h Fri Jun 11 15:02:23 2010 +0300 @@ -34,7 +34,6 @@ #include "sf_func.h" #include #include "f32trace.h" -#include #define __PRINT1TEMP_ALWAYS(t,a) {{TBuftemp(a);RDebug::Print(t,&temp);}} #define __PRINT2TEMP_ALWAYS(t,a,b) {{TBuftemp(b);RDebug::Print(t,a,&temp);}} @@ -144,6 +143,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; @@ -1705,7 +1711,6 @@ extern HBufC* TheDriveNames[]; extern TDrive TheDrives[KMaxDrives]; extern TFileName TheDefaultPath; -extern RFTrace TheFtrace; extern SCapabilitySet AllCapabilities; extern SCapabilitySet DisabledCapabilities; @@ -1839,10 +1844,6 @@ typedef TPckgBuf TMediaPswdReplyNotifyInfoV1Buf; -#if defined(__WINS__) - TInt MapWindowsFileName(TDes& aBuffer,const TDesC& aFileName); -#endif - enum TDllFindMethod {EFindInPath, EFindInSystemLibs, EFindInSystemBin, EFindExhausted}; //---------------------------------------------------------------------------------------------------------------------