i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs4: Fix connection recovery code

Browse Source
This commit is contained in:
Pawel Dziepak
2013-01-08 20:07:56 +01:00
parent fea92e7bb3
commit bd19f23cec
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
+1 -1
View File
@@ -243,7 +243,7 @@ NFS4Server::_Renewal()
} }
Request request(fServer, NULL); Request request(fServer, NULL);
request.Builder().Renew(fClientId); request.Builder().Renew(clientId);
request.Send(); request.Send();
switch (request.Reply().NFS4Error()) { switch (request.Reply().NFS4Error()) {
src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
+3 -3
View File
@@ -141,7 +141,7 @@ Server::SendCallAsync(Call* call, Reply** reply, Request** request)
ASSERT(reply != NULL); ASSERT(reply != NULL);
ASSERT(request != NULL); ASSERT(request != NULL);
if (fThreadError != B_OK) if (fThreadError != B_OK && Repair() != B_OK)
return fThreadError; return fThreadError;
Request* req = new(std::nothrow) Request; Request* req = new(std::nothrow) Request;
@@ -170,7 +170,7 @@ Server::ResendCallAsync(Call* call, Request* request)
ASSERT(call != NULL); ASSERT(call != NULL);
ASSERT(request != NULL); ASSERT(request != NULL);
if (fThreadError != B_OK) { if (fThreadError != B_OK && Repair() != B_OK) {
fRequests.FindRequest(request->fXID); fRequests.FindRequest(request->fXID);
delete request; delete request;
return fThreadError; return fThreadError;
@@ -212,7 +212,7 @@ Server::Repair()
uint32 thisRepair = fRepairCount; uint32 thisRepair = fRepairCount;
MutexLocker _(fRepairLock); MutexLocker _(fRepairLock);
if (fRepairCount == thisRepair) if (fRepairCount != thisRepair)
return B_OK; return B_OK;
fThreadCancel = true; fThreadCancel = true;