Verified Commit bdded127 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Remove the optional inode support 

the functionality wasn't used at all and it will be implemented later
with a different approach
parent 1a44c795

ifs/include/daemon/adafs_daemon.hpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ extern "C" { 
#include <daemon/classes/fs_data.hpp>

#include <daemon/classes/rpc_data.hpp>



#define INVALID_INODE static_cast<ino_t>(0)

#define ADAFS_DATA (static_cast<FsData*>(FsData::getInstance()))

#define RPC_DATA (static_cast<RPCData*>(RPCData::getInstance()))

ifs/include/daemon/classes/fs_data.hpp

+0 −19
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ private: 
    std::unordered_map<std::string, std::string> hashmap_;

    std::hash<std::string> hashf_;



    // inodes

    ino_t inode_count_;



    // Later the blocksize will likely be coupled to the chunks to allow individually big chunk sizes.

    blksize_t blocksize_;
@@ -56,16 +53,10 @@ private: 
    bool ctime_state_;

    bool uid_state_;

    bool gid_state_;

    bool inode_no_state_;

    bool link_cnt_state_;

    bool blocks_state_;



public:



    // mutex has a deleted method to assign an existing mutex. As such it cannot use getter or setters

    std::mutex inode_mutex;





    static FsData* getInstance() {

        static FsData instance;

        return &instance;
@@ -77,8 +68,6 @@ public: 


    // Utility member functions



    ino_t raise_inode_count(ino_t count);



    bool is_local_op(size_t recipient);



    // getter/setter
@@ -91,10 +80,6 @@ public: 


    void hashf(const std::hash<std::string>& hashf_);



    ino_t inode_count() const;



    void inode_count(ino_t inode_count);



    blksize_t blocksize() const;



    void blocksize(blksize_t blocksize_);
@@ -169,10 +154,6 @@ public: 


    void gid_state(bool gid_state);



    bool inode_no_state() const;



    void inode_no_state(bool inode_no_state);



    bool link_cnt_state() const;



    void link_cnt_state(bool link_cnt_state);

ifs/include/global/configure.hpp

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define MDATA_USE_CTIME false

#define MDATA_USE_UID false

#define MDATA_USE_GID false

#define MDATA_USE_INODE_NO false

#define MDATA_USE_LINK_CNT false

#define MDATA_USE_BLOCKS false

#define MDATA_USE_SIZE true // XXX to be added in ADAFS_DATA. currently on by default

ifs/include/global/metadata.hpp

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ private: 
    uid_t uid_;

    gid_t gid_;

    mode_t mode_;

    unsigned long inode_no_;

    nlink_t link_count_;   // number of names for this inode (hardlinks)

    size_t size_;          // size_ in bytes, might be computed instead of stored

    blkcnt_t blocks_;      // allocated file system blocks_
@@ -45,8 +44,6 @@ public: 
    void gid(gid_t gid_);

    mode_t mode() const;

    void mode(mode_t mode_);

    unsigned long inode_no() const;

    void inode_no(unsigned long inode_no_);

    nlink_t link_count() const;

    void link_count(nlink_t link_count_);

    size_t size() const;

ifs/include/global/rpc/ipc_types.hpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ MERCURY_GEN_PROC(ipc_config_out_t, ((hg_const_string_t) (mountdir)) 
((hg_bool_t) (ctime_state)) \

((hg_bool_t) (uid_state)) \

((hg_bool_t) (gid_state)) \

((hg_bool_t) (inode_no_state)) \

((hg_bool_t) (link_cnt_state)) \

((hg_bool_t) (blocks_state)) \

((hg_uint32_t) (uid)) \