From 709cfbf7501c5a2c74c1df527af4babc04851459 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Thu, 13 Apr 2017 03:49:54 -0500
Subject: [PATCH] Remove inode parameter from space needed

---
 src/ox/fs/filestore.hpp  | 4 ++--
 src/ox/fs/filesystem.hpp | 8 ++++----
 src/ox/fs/oxfstool.cpp   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ox/fs/filestore.hpp b/src/ox/fs/filestore.hpp
index 68bb747f4..6044d52c8 100644
--- a/src/ox/fs/filestore.hpp
+++ b/src/ox/fs/filestore.hpp
@@ -200,7 +200,7 @@ class FileStore {
 		 * @param size the size of the data to insert
 		 * @return the space currently available in this file store.
 		 */
-		typename Header::FsSize_t spaceNeeded(InodeId_t id, typename Header::FsSize_t size);
+		typename Header::FsSize_t spaceNeeded(typename Header::FsSize_t size);
 
 		/**
 		 * Returns the size of the file store.
@@ -564,7 +564,7 @@ typename FileStore<Header>::StatInfo FileStore<Header>::stat(InodeId_t id) {
 }
 
 template<typename Header>
-typename Header::FsSize_t FileStore<Header>::spaceNeeded(InodeId_t id, typename Header::FsSize_t size) {
+typename Header::FsSize_t FileStore<Header>::spaceNeeded(typename Header::FsSize_t size) {
 	return sizeof(Inode) + size;
 }
 
diff --git a/src/ox/fs/filesystem.hpp b/src/ox/fs/filesystem.hpp
index b3b97812e..f952bd1e3 100644
--- a/src/ox/fs/filesystem.hpp
+++ b/src/ox/fs/filesystem.hpp
@@ -46,7 +46,7 @@ class FileSystem {
 
 		virtual FileStat stat(uint64_t inode) = 0;
 
-		virtual uint64_t spaceNeeded(uint64_t id, uint64_t size) = 0;
+		virtual uint64_t spaceNeeded(uint64_t size) = 0;
 
 		virtual uint64_t available() = 0;
 
@@ -124,7 +124,7 @@ class FileSystemTemplate: public FileSystem {
 
 		FileStat stat(uint64_t inode) override;
 
-		uint64_t spaceNeeded(uint64_t id, uint64_t size) override;
+		uint64_t spaceNeeded(uint64_t size) override;
 
 		uint64_t available() override;
 
@@ -234,8 +234,8 @@ void FileSystemTemplate<FileStore, FS_TYPE>::resize(uint64_t size) {
 }
 
 template<typename FileStore, FsType FS_TYPE>
-uint64_t FileSystemTemplate<FileStore, FS_TYPE>::spaceNeeded(uint64_t id, uint64_t size) {
-	return store->spaceNeeded(id, size);
+uint64_t FileSystemTemplate<FileStore, FS_TYPE>::spaceNeeded(uint64_t size) {
+	return store->spaceNeeded(size);
 }
 
 template<typename FileStore, FsType FS_TYPE>
diff --git a/src/ox/fs/oxfstool.cpp b/src/ox/fs/oxfstool.cpp
index d9bd874ef..1ce738242 100644
--- a/src/ox/fs/oxfstool.cpp
+++ b/src/ox/fs/oxfstool.cpp
@@ -198,7 +198,7 @@ int write(int argc, char **args, bool expand) {
 					auto fs = createFileSystem(fsBuff, fsSize);
 					if (fs) {
 						if (expand && fs->available() <= srcSize) {
-							auto needed = fs->size() + fs->spaceNeeded(inode, srcSize);
+							auto needed = fs->size() + fs->spaceNeeded(srcSize);
 							fsSize = needed;
 							fs = expandCopyCleanup(fs, needed);
 						}