FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfile/sf

equal deleted inserted replaced

-:657f875b013e
+:73ea206103e6
 		else
 			{
 			// Current operation points to a local buffer
 			// The request originated from the file server (e.g. file cache) with a local message handle (KLocalMessageHandle)
 			TPtr8 dataDesc((TUint8*) currentOperation.iReadWriteArgs.iData + currentOperation.iReadWriteArgs.iOffset, len, len);
-			const RLocalMessage msg;
-			TRAP(r,file->ReadL(pos, len, &dataDesc, msg, 0));
+			// save the client's RMessage2
+			const RMessage2 msgClient = aRequest->Message();
+			// overwrite RMessage2 in CFsMessageRequest with RLocalMessage
+			const RLocalMessage msgLocal;
+			const_cast<RMessage2&> (aRequest->Message()) = msgLocal;
+			TRAP(r,file->ReadL(pos, len, &dataDesc, aRequest->Message(), 0));
+			// restore the client's RMessage2
+			const_cast<RMessage2&> (aRequest->Message()) = msgClient;
 			}
 		}
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 			TRAP(r,file->WriteL(pos, len, (const TPtrC8*) aRequest->Message().Ptr0(), aRequest->Message(), currentOperation.iReadWriteArgs.iOffset))
 			}
 		else
 			{
 			TPtr8 dataDesc((TUint8*) currentOperation.iReadWriteArgs.iData + currentOperation.iReadWriteArgs.iOffset, len, len);
-			const RLocalMessage msg;
-			TRAP(r,file->WriteL(pos, len, &dataDesc, msg, 0));
+			// save the client's RMessage2
+			const RMessage2 msgClient = aRequest->Message();
+			// overwrite RMessage2 in CFsMessageRequest with RLocalMessage
+			const RLocalMessage msgLocal;
+			const_cast<RMessage2&> (aRequest->Message()) = msgLocal;
+			TRAP(r,file->WriteL(pos, len, &dataDesc, aRequest->Message(), 0));
+			// restore the client's RMessage2
+			const_cast<RMessage2&> (aRequest->Message()) = msgClient;
 			}
 		}
 //RDebug::Print(_L("WriteR: req %08X pos %ld\t len %d file %08X\n"), aRequest, pos, len, file);
 }
+EXPORT_C TBool CFileCB::DirectIOMode(const RMessagePtr2& aMessage)
+	{
+	CFsMessageRequest* msgRequest = CFsMessageRequest::RequestFromMessage(aMessage);
+	TInt func = msgRequest->Operation()->Function();
+	ASSERT(func == EFsFileRead || func == EFsFileWrite || func == EFsFileWriteDirty || func == EFsReadFileSection);
+	CFileShare* share;
+	CFileCB* file;
+	GetFileFromScratch(msgRequest, share, file);
+	if (share == NULL)		// no share indicates this is a request originating from the file cache
+		return EFalse;
+	return func == EFsFileRead ? share->iMode & EFileReadDirectIO : share->iMode & EFileWriteDirectIO;
+	}

changeset 200	73ea206103e6
parent 152	657f875b013e
child 201	43365a9b78a3