From a4caa431e4d815581cbd0e71ff0644d2b260d0ec Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Wed, 13 Feb 2013 20:21:53 +0100 Subject: [PATCH] nfs4: Make sure Request::fNext is initially NULL --- src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp | 1 + src/add-ons/kernel/file_systems/nfs4/RPCServer.h | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp index 9506af64e5..811d3d4a5a 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp @@ -46,6 +46,7 @@ RequestManager::AddRequest(Request* request) else fQueueHead = request; fQueueTail = request; + request->fNext = NULL; } diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCServer.h b/src/add-ons/kernel/file_systems/nfs4/RPCServer.h index 9421049918..35c52f8bc1 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCServer.h +++ b/src/add-ons/kernel/file_systems/nfs4/RPCServer.h @@ -41,6 +41,9 @@ public: private: mutex fLock; + + // Neither SinglyLinkedList nor DoublyLinkedList is what we want + // here. And DoublyLinkedQueue is not even a queue. Request* fQueueHead; Request* fQueueTail; @@ -72,8 +75,8 @@ public: status_t Repair(); - inline const PeerAddress& ID() const; - inline PeerAddress LocalID() const; + inline const PeerAddress& ID() const; + inline PeerAddress LocalID() const; inline ProgramData* PrivateData(); inline void SetPrivateData(ProgramData* privateData); @@ -94,7 +97,7 @@ private: RequestManager fRequests; Connection* fConnection; - const PeerAddress* fAddress; + const PeerAddress* fAddress; ProgramData* fPrivateData;