Commit b66841ca authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/fixes' into 'master' 

fixes for riscv

Fix a missing syscall in riscv

See merge request !276
parents 2ec5ea0e 89e6cf10

src/client/hooks.cpp

+10 −0
Original line number Diff line number Diff line
@@ -711,7 +711,12 @@ hook_lchown(const char* path, uid_t owner, gid_t group) { 
            __func__);

        return 0;

    }

#ifdef SYS_lchown

    return syscall_no_intercept_wrapper(SYS_lchown, path, owner, group);

#else

    return syscall_no_intercept_wrapper(SYS_fchownat, AT_FDCWD, path, owner,

                                        group, AT_SYMLINK_NOFOLLOW);

#endif

}



int
@@ -725,7 +730,12 @@ hook_chown(const char* path, uid_t owner, gid_t group) { 
            __func__);

        return 0;

    }

#ifdef SYS_chown

    return syscall_no_intercept_wrapper(SYS_chown, path, owner, group);

#else

    return syscall_no_intercept_wrapper(SYS_fchownat, AT_FDCWD, path, owner,

                                        group, 0);

#endif

}



int

src/daemon/daemon.cpp

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ void 
init_rpc_server() {

    // Thallium Init

    auto margo_config = fmt::format(

            R"({{ "use_progress_thread" : true, "rpc_thread_count" : {} }})",

            R"({{ "mercury": {{ "request_post_init": 2048 }}, 

               "use_progress_thread" : true, "rpc_thread_count" : {} }})",

            gkfs::config::rpc::daemon_handler_xstreams);



    // We treat margo_config as the initialization string for Thallium engine