[haiku-commits] BRANCH pdziepak-github.nfs4 - src/add-ons/kernel/file_systems/nfs4
- From: pdziepak-github.nfs4 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 2 Jan 2013 16:45:43 +0100 (CET)
added 1 changeset to branch 'refs/remotes/pdziepak-github/nfs4'
old head: 68e64c7ab03104b2464814ec3ddcf57f008eabac
new head: 8837efd0253fd668a6879552977ced39d7eb7a15
overview: https://github.com/pdziepak/Haiku/compare/68e64c7...8837efd
----------------------------------------------------------------------------
8837efd: nfs4: FileSystem may be destroyed before setting RPCServer private data
[ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: 8837efd0253fd668a6879552977ced39d7eb7a15
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Wed Jan 2 15:40:23 2013 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 1 deletion(-)
src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp | 4 +++-
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
index caf4037..fd5e57b 100644
--- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
@@ -46,7 +46,9 @@ FileSystem::FileSystem(const MountConfiguration&
configuration)
FileSystem::~FileSystem()
{
- NFSServer()->RemoveFileSystem(this);
+ NFS4Server* server =
reinterpret_cast<NFS4Server*>(fServer->PrivateData());
+ if (server != NULL)
+ server->RemoveFileSystem(this);
mutex_destroy(&fDelegationLock);
mutex_destroy(&fOpenLock);
Other related posts:
