diff options
| author | randomdan <randomdan@localhost> | 2013-08-22 01:13:45 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2013-08-22 01:13:45 +0000 |
| commit | a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e (patch) | |
| tree | 74fb166e2b6758afd6120088de179114d3679cc9 /netfs/fuse.h | |
| parent | Emergency I-broke-it-bump, don't bind write_buf and read_buf (diff) | |
| download | netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.tar.bz2 netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.tar.xz netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.zip | |
Only bind fuse wrappers into fuse_operations for functions that have overrides in a deriving class
Diffstat (limited to 'netfs/fuse.h')
| -rw-r--r-- | netfs/fuse.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/netfs/fuse.h b/netfs/fuse.h index 0b25ad7..4a0abfd 100644 --- a/netfs/fuse.h +++ b/netfs/fuse.h @@ -9,7 +9,7 @@ #include "entCache.h" #include "intrusivePtrBase.h" -#define LOCK boost::unique_lock<boost::mutex> _lck(lock) +#define LOCK boost::unique_lock<boost::mutex> _lck(_lock) class NetFS : public FuseAppBase { @@ -48,6 +48,7 @@ class NetFS : public FuseAppBase int opt_parse(void *, const char * arg, int key, struct fuse_args *); void connect(); void connect_nl(); + public: // misc int access(const char * p, int a); int getattr(const char * p, struct stat * s); @@ -78,6 +79,7 @@ class NetFS : public FuseAppBase int statfs(const char *, struct statvfs *); // stuff int onError(const std::exception & err) throw(); + private: int getNextFileID(); Ice::Int getRemoteIDforFile(int localID) const; int getNextDirID(); @@ -89,7 +91,7 @@ class NetFS : public FuseAppBase char ** _argv; Ice::CommunicatorPtr ic; FuseConfigPtr fc; - mutable boost::mutex lock; + mutable boost::mutex _lock; NetFSComms::FileSystemPrx filesystem; NetFSComms::ServicePrx service; |