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

nfs4: minor improvements in VnodeToInode code * removal of now unnecessary NULL check * Clear() is Replace(NULL)

Browse Source
This commit is contained in:
Pawel Dziepak
2013-04-04 15:11:16 +02:00
parent 5f0e4e4a81
commit 46bffd5839
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/VnodeToInode.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ void
VnodeToInode::Replace(Inode* newInode) VnodeToInode::Replace(Inode* newInode)
{ {
WriteLocker _(fLock); WriteLocker _(fLock);
if (fInode != NULL && !IsRoot()) if (!IsRoot())
delete fInode; delete fInode;
fInode = newInode; fInode = newInode;
src/add-ons/kernel/file_systems/nfs4/VnodeToInode.h
+2 -5
View File
@@ -72,7 +72,7 @@ VnodeToInode::VnodeToInode(ino_t id, FileSystem* fileSystem)
inline inline
VnodeToInode::~VnodeToInode() VnodeToInode::~VnodeToInode()
{ {
Replace(NULL); Clear();
if (fFileSystem != NULL && !IsRoot()) if (fFileSystem != NULL && !IsRoot())
fFileSystem->InoIdMap()->RemoveEntry(fID); fFileSystem->InoIdMap()->RemoveEntry(fID);
rw_lock_destroy(&fLock); rw_lock_destroy(&fLock);
@@ -96,10 +96,7 @@ VnodeToInode::Unlock()
inline void inline void
VnodeToInode::Clear() VnodeToInode::Clear()
{ {
WriteLocker _(fLock); Replace(NULL);
if (!IsRoot())
delete fInode;
fInode = NULL;
} }