From 46bffd5839fc9a1cc8a2277ca5dea4664d082ec9 Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Wed, 27 Mar 2013 00:25:12 +0100
Subject: [PATCH] nfs4: minor improvements in VnodeToInode code * removal of
 now unnecessary NULL check * Clear() is Replace(NULL)

---
 src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp | 2 +-
 src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h   | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp b/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp
index 2e20cfc22b..6e260bc4ba 100644
--- a/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp
@@ -27,7 +27,7 @@ void
 VnodeToInode::Replace(Inode* newInode)
 {
 	WriteLocker _(fLock);
-	if (fInode != NULL && !IsRoot())
+	if (!IsRoot())
 		delete fInode;
 
 	fInode = newInode;
diff --git a/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h b/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h
index b75528aaea..ee04a454c3 100644
--- a/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h
+++ b/src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h
@@ -72,7 +72,7 @@ VnodeToInode::VnodeToInode(ino_t id, FileSystem* fileSystem)
 inline
 VnodeToInode::~VnodeToInode()
 {
-	Replace(NULL);
+	Clear();
 	if (fFileSystem != NULL && !IsRoot())
 		fFileSystem->InoIdMap()->RemoveEntry(fID);
 	rw_lock_destroy(&fLock);
@@ -96,10 +96,7 @@ VnodeToInode::Unlock()
 inline void
 VnodeToInode::Clear()
 {
-	WriteLocker _(fLock);
-	if (!IsRoot())
-		delete fInode;
-	fInode = NULL;
+	Replace(NULL);
 }