diff options
| author | Jinmou Li <jinmli@google.com> | 2020-09-16 01:34:28 +0000 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-09-16 12:22:17 -0700 |
| commit | 26879c32b8b48b6c066f1a5ba2c787e7061dabae (patch) | |
| tree | df557dac1a4224f43cbd5ac44d972f65c61eecfe | |
| parent | 5c080f07deea6ae18ec026b394d9ea5d76ab4566 (diff) | |
FUSE readdir test fix ino initialization
| -rw-r--r-- | test/fuse/linux/readdir_test.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/fuse/linux/readdir_test.cc b/test/fuse/linux/readdir_test.cc index 4b67b02f5..ab61eb676 100644 --- a/test/fuse/linux/readdir_test.cc +++ b/test/fuse/linux/readdir_test.cc @@ -41,13 +41,14 @@ namespace { class ReaddirTest : public FuseTest { public: - void fill_fuse_dirent(char *buf, const char *name) { + void fill_fuse_dirent(char *buf, const char *name, uint64_t ino) { size_t namelen = strlen(name); size_t entlen = FUSE_NAME_OFFSET + namelen; size_t entlen_padded = FUSE_DIRENT_ALIGN(entlen); struct fuse_dirent *dirent; dirent = reinterpret_cast<struct fuse_dirent *>(buf); + dirent->ino = ino; dirent->namelen = namelen; memcpy(dirent->name, name, namelen); memset(dirent->name + namelen, 0, entlen_padded - entlen); @@ -61,11 +62,12 @@ TEST_F(ReaddirTest, SingleEntry) { const std::string test_dir_path = JoinPath(mount_point_.path().c_str(), test_dir_name_); + const uint64_t ino_dir = 1024; // We need to make sure the test dir is a directory that can be found. mode_t expected_mode = S_IFDIR | S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; struct fuse_attr dir_attr = { - .ino = 1, + .ino = ino_dir, .size = 512, .blocks = 4, .mode = expected_mode, @@ -124,11 +126,12 @@ TEST_F(ReaddirTest, SingleEntry) { std::vector<char> readdir_payload_vec(readdir_payload_size); char *readdir_payload = readdir_payload_vec.data(); - fill_fuse_dirent(readdir_payload, dot.c_str()); - fill_fuse_dirent(readdir_payload + dot_file_dirent_size, dot_dot.c_str()); + // Use fake ino for other directories. + fill_fuse_dirent(readdir_payload, dot.c_str(), ino_dir-2); + fill_fuse_dirent(readdir_payload + dot_file_dirent_size, dot_dot.c_str(), ino_dir-1); fill_fuse_dirent( readdir_payload + dot_file_dirent_size + dot_dot_file_dirent_size, - test_file.c_str()); + test_file.c_str(), ino_dir); struct fuse_out_header readdir_header = { .len = uint32_t(sizeof(struct fuse_out_header) + readdir_payload_size), |