Remove the readonly bits... never made sense

5 files changed, 2 insertions, 17 deletions

diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index 9aab62c..a84c2e1 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -238,12 +238,6 @@ VolumeServer::unlink(const NetFS::ReqEnv & re, const std::string & path, const I
 	}
 }
 
-NetFS::ReadOnlyFilePrx
-VolumeServer::openReadOnly(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, const Ice::Current & ice)
-{
-	return open(re, path, flags, ice);
-}
-
 NetFS::FilePrx
 VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, const Ice::Current & ice)
 {
diff --git a/netfs/daemon/daemonVolume.h b/netfs/daemon/daemonVolume.h
index 18441f1..14e06d3 100644
--- a/netfs/daemon/daemonVolume.h
+++ b/netfs/daemon/daemonVolume.h
@@ -21,7 +21,6 @@ class VolumeServer : public NetFS::Volume {
 		virtual void unlink(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
 
 		virtual NetFS::FilePrx open(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, const Ice::Current&) override;
-		virtual NetFS::ReadOnlyFilePrx openReadOnly(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, const Ice::Current&) override;
 		virtual NetFS::FilePrx create(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, Ice::Int mode, const Ice::Current&) override;
 
 		virtual NetFS::VFS statfs(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
diff --git a/netfs/ice/directory.ice b/netfs/ice/directory.ice
index 7468503..b77a1ad 100644
--- a/netfs/ice/directory.ice
+++ b/netfs/ice/directory.ice
@@ -10,7 +10,6 @@ module NetFS {
 
 		idempotent NameList readdir() throws AuthError, SystemError;
 	};
-	
 };
 
 #endif
diff --git a/netfs/ice/file.ice b/netfs/ice/file.ice
index bbfb2d5..a622745 100644
--- a/netfs/ice/file.ice
+++ b/netfs/ice/file.ice
@@ -5,14 +5,11 @@
 #include "types.ice"
 
 module NetFS {
-	interface ReadOnlyFile {
+	interface File {
 		void close() throws AuthError, SystemError;
 
 		idempotent Attr fgetattr(ReqEnv env) throws AuthError, SystemError;
 		idempotent Buffer read(long offset, long size) throws AuthError, SystemError;
-	};
-
-	interface File extends ReadOnlyFile {
 		idempotent void ftruncate(ReqEnv env, long size) throws AuthError, SystemError;
 		idempotent void write(long offset, long size, Buffer data) throws AuthError, SystemError;
 	};
diff --git a/netfs/ice/volume.ice b/netfs/ice/volume.ice
index 34f46ba..8d5d9a7 100644
--- a/netfs/ice/volume.ice
+++ b/netfs/ice/volume.ice
@@ -7,19 +7,15 @@
 #include "directory.ice"
 
 module NetFS {
-	interface ReadOnlyVolume {
+	interface Volume {
 		void disconnect() throws AuthError;
 
-		ReadOnlyFile * openReadOnly(ReqEnv env, string path, int flags) throws AuthError, SystemError;
 		Directory * opendir(ReqEnv env, string path) throws AuthError, SystemError;
 
 		idempotent VFS statfs(ReqEnv env, string path) throws AuthError, SystemError;
 		idempotent int access(ReqEnv env, string path, int mode) throws AuthError, SystemError;
 		idempotent Attr getattr(ReqEnv env, string path) throws AuthError, SystemError;
 		idempotent string readlink(ReqEnv env, string path) throws AuthError, SystemError;
-	};
-
-	interface Volume extends ReadOnlyVolume {
 		File * open(ReqEnv env, string path, int flags) throws AuthError, SystemError;
 		File * create(ReqEnv env, string path, int flags, int mode) throws AuthError, SystemError;