From f07c229d99a535eb8cfe92439613ad95dee40463 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 21 Apr 2022 20:54:52 +0100
Subject: Breaking: remove unused reqenv from ftruncate and fgetattr

---
 netfs/daemon/daemonFile.cpp | 6 ++----
 netfs/daemon/daemonFile.h   | 4 ++--
 netfs/fuse/fuseFiles.cpp    | 4 ++--
 netfs/ice/file.ice          | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/netfs/daemon/daemonFile.cpp b/netfs/daemon/daemonFile.cpp
index d9f5105..fb146a4 100644
--- a/netfs/daemon/daemonFile.cpp
+++ b/netfs/daemon/daemonFile.cpp
@@ -12,9 +12,8 @@
 FileServer::FileServer(int f, EntryTypeConverter & t) : EntryTypeConverter(t), fd(f) { }
 
 void
-FileServer::ftruncate(const NetFS::ReqEnv re, Ice::Long size, const Ice::Current &)
+FileServer::ftruncate(Ice::Long size, const Ice::Current &)
 {
-	(void)re;
 	errno = 0;
 	if (::ftruncate(fd, size) != 0) {
 		throw NetFS::SystemError(errno);
@@ -22,9 +21,8 @@ FileServer::ftruncate(const NetFS::ReqEnv re, Ice::Long size, const Ice::Current
 }
 
 NetFS::Attr
-FileServer::fgetattr(const NetFS::ReqEnv re, const Ice::Current &)
+FileServer::fgetattr(const Ice::Current &)
 {
-	(void)re;
 	struct stat s { };
 	if (::fstat(fd, &s) != 0) {
 		throw NetFS::SystemError(errno);
diff --git a/netfs/daemon/daemonFile.h b/netfs/daemon/daemonFile.h
index e1c6c06..282c74e 100644
--- a/netfs/daemon/daemonFile.h
+++ b/netfs/daemon/daemonFile.h
@@ -8,8 +8,8 @@ public:
 	FileServer(int fd, EntryTypeConverter &);
 
 	void close(const Ice::Current &) override;
-	void ftruncate(const NetFS::ReqEnv, Ice::Long size, const Ice::Current &) override;
-	NetFS::Attr fgetattr(const NetFS::ReqEnv, const Ice::Current &) override;
+	void ftruncate(Ice::Long size, const Ice::Current &) override;
+	NetFS::Attr fgetattr(const Ice::Current &) override;
 
 	NetFS::Buffer read(Ice::Long offset, Ice::Long size, const Ice::Current &) override;
 	void write(Ice::Long offset, Ice::Long size, const ::std::pair<const ::Ice::Byte *, const ::Ice::Byte *> data,
diff --git a/netfs/fuse/fuseFiles.cpp b/netfs/fuse/fuseFiles.cpp
index 6b1ad1a..03cb394 100644
--- a/netfs/fuse/fuseFiles.cpp
+++ b/netfs/fuse/fuseFiles.cpp
@@ -228,7 +228,7 @@ namespace NetFS {
 				auto of = getProxy<OpenFilePtr>(fi->fh);
 				of->wait();
 				auto remote = of->remote;
-				remote->ftruncate(reqEnv(), o);
+				remote->ftruncate(o);
 			}
 			else {
 				volume->truncate(reqEnv(), p, o);
@@ -248,7 +248,7 @@ namespace NetFS {
 				auto of = getProxy<OpenFilePtr>(fi->fh);
 				of->wait();
 				auto remote = of->remote;
-				*s = converter.convert(remote->fgetattr(reqEnv()));
+				*s = converter.convert(remote->fgetattr());
 			}
 			else {
 				if (auto cacehedStat = statCache.get(p)) {
diff --git a/netfs/ice/file.ice b/netfs/ice/file.ice
index 45241f9..9fc2bf8 100644
--- a/netfs/ice/file.ice
+++ b/netfs/ice/file.ice
@@ -7,9 +7,9 @@ module NetFS {
 	interface File {
 		void close() throws AuthError, SystemError;
 
-		idempotent Attr fgetattr(ReqEnv env) throws AuthError, SystemError;
+		idempotent Attr fgetattr() throws AuthError, SystemError;
 		idempotent Buffer read(long offset, long size) throws AuthError, SystemError;
-		idempotent void ftruncate(ReqEnv env, long size) throws AuthError, SystemError;
+		idempotent void ftruncate(long size) throws AuthError, SystemError;
 		idempotent void write(long offset, long size, ["cpp:array"] Buffer data) throws AuthError, SystemError;
 		idempotent long copyrange(File * to, long offsetsrc, long offsetdest, long size, int flags) throws AuthError, SystemError;
 	};
-- 
cgit v1.2.3