Commit 0cc7ae35 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/355-support-and-on-directories' into 'master' 

Resolve "Support . and .. on directories"

Closes #355

Closes #355

See merge request !248
parents 87421281 1219ede4

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -96,3 +96,4 @@ builds/ 
# Allow users to provide their own CMake presets

CMakeUserPresets.json

gkfs/

.gitlab-ci-local/

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
  - Update CLI11 and fmt to avoid cmake errors ([!231])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/231))

  - Update CLI11 in modules ([!232](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/232)).

  - Faster initialization relaying on host_files information instead of server RPC ([!242](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/242))

  - Directories shows . and .. to support scandir ([!248](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/248))

  

### Fixed

  - Dup3 is supported if O_CLOEXEC is not used (i.e. hexdump) ([!228](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/228))

CMakePresets.json

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        "GKFS_BUILD_TOOLS": true,

        "GKFS_BUILD_TESTS": true,

        "GKFS_INSTALL_TESTS": true,

        "GKFS_CHUNK_STATS": true,

        "GKFS_SYMLINK_SUPPORT": true,

        "GKFS_ENABLE_PROMETHEUS": true,

        "GKFS_RENAME_SUPPORT": true,

        "GKFS_FOLLOW_EXTERNAL_SYMLINKS": true,

include/client/gkfs_functions.hpp

+1 −2
Original line number Diff line number Diff line
@@ -42,11 +42,10 @@ 


#include <client/open_file_map.hpp>

#include <common/metadata.hpp>

#include <client/intercept.hpp>



struct statfs;

struct statvfs;

struct linux_dirent;

struct linux_dirent64;



namespace gkfs::syscall {

include/client/hooks.hpp

+1 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern "C" { 
#include <client/void_syscall_intercept.hpp>

#endif



#include <client/intercept.hpp>



/*

 * For PowerPC, syscall_no_intercept_wrapper() is defined in the
@@ -75,8 +76,6 @@ syscall_no_intercept_wrapper(long syscall_number, Args... args) { 
#endif



struct statfs;

struct linux_dirent;

struct linux_dirent64;



namespace gkfs::hook {