From 09c07e4c5c93be118d9f11b1dda5214a47e3749b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 1 Apr 2014 06:23:48 +0200
Subject: [PATCH] packagefs: PackagesDirectory: Use node_ref

---
 .../packagefs/volume/PackagesDirectory.cpp            | 10 ++++++----
 .../file_systems/packagefs/volume/PackagesDirectory.h | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.cpp
index 34e4b7c412..6648a73103 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.cpp
@@ -18,7 +18,9 @@
 PackagesDirectory::PackagesDirectory()
 	:
 	fPath(NULL),
-	fDirFD(-1)
+	fDirFD(-1),
+	fNodeRef(),
+	fHashNext(NULL)
 {
 }
 
@@ -72,8 +74,8 @@ status_t PackagesDirectory::Init(const char* path, dev_t mountPointDeviceID,
 	if (fstat(fDirFD, &st) < 0)
 		RETURN_ERROR(errno);
 
-	fDeviceID = st.st_dev;
-	fNodeID = st.st_ino;
+	fNodeRef.device = st.st_dev;
+	fNodeRef.node = st.st_ino;
 
 	// get a normalized path
 	KPath normalizedPath;
@@ -81,7 +83,7 @@ status_t PackagesDirectory::Init(const char* path, dev_t mountPointDeviceID,
 		RETURN_ERROR(normalizedPath.InitCheck());
 
 	char* normalizedPathBuffer = normalizedPath.LockBuffer();
-	error = vfs_entry_ref_to_path(fDeviceID, fNodeID, NULL, true,
+	error = vfs_entry_ref_to_path(fNodeRef.device, fNodeRef.node, NULL, true,
 		normalizedPathBuffer, normalizedPath.BufferSize());
 	if (error != B_OK)
 		RETURN_ERROR(error);
diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.h b/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.h
index 85b2e61279..9481bd7f6b 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.h
+++ b/src/add-ons/kernel/file_systems/packagefs/volume/PackagesDirectory.h
@@ -10,6 +10,8 @@
 
 #include <Referenceable.h>
 
+#include "NodeRef.h"
+
 
 class PackagesDirectory : public BReferenceable {
 public:
@@ -20,10 +22,12 @@ public:
 									{ return fPath; }
 			int					DirectoryFD() const
 									{ return fDirFD; }
+			const node_ref&		NodeRef() const
+									{ return fNodeRef; }
 			dev_t				DeviceID() const
-									{ return fDeviceID; }
+									{ return fNodeRef.device; }
 			ino_t				NodeID() const
-									{ return fNodeID; }
+									{ return fNodeRef.node; }
 
 			status_t			Init(const char* path, dev_t mountPointDeviceID,
 									ino_t mountPointNodeID, struct stat& _st);
@@ -31,8 +35,7 @@ public:
 private:
 			char*				fPath;
 			int					fDirFD;
-			dev_t				fDeviceID;
-			ino_t				fNodeID;
+			node_ref			fNodeRef;
 };