userlibandfileserver/fileserver/sfile/sf_memory_client.cpp
branchRCL_3
changeset 44 3e88ff8f41d5
parent 43 c1f20ce4abcf
--- a/userlibandfileserver/fileserver/sfile/sf_memory_client.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/userlibandfileserver/fileserver/sfile/sf_memory_client.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -144,7 +144,7 @@
 
 	iTouchedRegionFlag = 0;
 	iReusablePagePool.Close();
-	r = iReusablePagePool.Reserve(iReservedRegionMarkInSegs);
+	iReusablePagePool.Reserve(iReservedRegionMarkInSegs);
     if (r != KErrNone)
         {
         ASSERT(0);
@@ -174,8 +174,7 @@
        	return addr;
        	}
     
-    TBool touchedMore = EFalse;
-	// if we have touched beyond reserved region, get new pages from reusable pool first
+	// if we have used up reserved region, get new pages from reusable pool first
     if (iReusablePagePool.Count())
     	{
 		addr = iReusablePagePool[0];
@@ -186,7 +185,7 @@
     else
     	{
     	addr = iBase + (iTouchedRegionFlag << iSegSizeInBytesLog2);
-    	touchedMore = ETrue;
+    	iTouchedRegionFlag += aSegmentCount;
 //       	__PRINT2(_L("!! GROW TOUCHED SEGS: addr=0x%x, touched=%d"), addr, iTouchedRegionFlag);
     	}
 	
@@ -202,10 +201,6 @@
 	if (r != KErrNone)
 		return NULL;
 
-	if (touchedMore)
-	    {
-	    iTouchedRegionFlag += aSegmentCount;
-	    }
 	return addr;
 	}