diff options
Diffstat (limited to 'netfs/daemon/daemonVolume.cpp')
| -rw-r--r-- | netfs/daemon/daemonVolume.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 3ec6865..7603691 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -5,7 +5,6 @@ #include <sys/stat.h> #include <limits.h> #include <fcntl.h> -#include <typeConvert.h> #include "daemonVolume.h" #include "daemonFile.h" #include "daemonDirectory.h" @@ -21,7 +20,8 @@ extern std::map<Ice::Int, int> files; VolumeServer::VolumeServer(const boost::filesystem::path & r, const EntCache<User> & u, const EntCache<Group> & g) : root(boost::filesystem::canonical(r)), userLookup(u), - groupLookup(g) + groupLookup(g), + converter(u, g) { } @@ -71,9 +71,7 @@ VolumeServer::getattr(const NetFS::ReqEnv & re, const std::string & path, const if (::lstat(p.c_str(), &s) != 0) { throw NetFS::SystemError(errno); } - NetFS::Attr a; - a << StatSource { s, userLookup, groupLookup }; - return a; + return converter.convert(s); } void @@ -202,9 +200,7 @@ VolumeServer::statfs(const NetFS::ReqEnv & re, const std::string & path, const I if (::statvfs(p.c_str(), &s) != 0) { throw NetFS::SystemError(errno); } - NetFS::VFS t; - t << s; - return t; + return converter.convert(s); } void |