Skip to content

Commit 2d47ee2

Browse files
committed
This commit upgrades the FUSE API to protocol 7.36, it doesn't implement any of protocol 7.36's new features.
1 parent 0dcfecb commit 2d47ee2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

sys/fs/fuse/fuse_internal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,10 +1118,8 @@ fuse_internal_send_init(struct fuse_data *data, struct thread *td)
11181118
fiii->flags = FUSE_ASYNC_READ | FUSE_POSIX_LOCKS | FUSE_EXPORT_SUPPORT
11191119
| FUSE_BIG_WRITES | FUSE_WRITEBACK_CACHE
11201120
| FUSE_NO_OPEN_SUPPORT | FUSE_NO_OPENDIR_SUPPORT
1121-
| FUSE_SETXATTR_EXT;
1122-
1123-
if (fuse_libabi_geq(data, 7, 36))
1124-
fiii->flags2 = 0;
1121+
| FUSE_SETXATTR_EXT | FUSE_INIT_EXT;
1122+
fiii->flags2 = 0;
11251123

11261124
fuse_insert_callback(fdi.tick, fuse_internal_init_callback);
11271125
fuse_insert_message(fdi.tick, false);

tests/sys/fs/fusefs/mockfs.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extern "C" {
5555

5656
using namespace testing;
5757

58-
int verbosity = 0;
58+
int verbosity = 1;
5959

6060
const char* opcode2opname(uint32_t opcode)
6161
{
@@ -763,6 +763,7 @@ void MockFS::init(uint32_t flags) {
763763
out->body.init.major = FUSE_KERNEL_VERSION;
764764
out->body.init.minor = m_kernel_minor_version;;
765765
out->body.init.flags = in->body.init.flags & flags;
766+
out->body.init.flags2 = 0;
766767
out->body.init.max_write = m_maxwrite;
767768
out->body.init.max_readahead = m_maxreadahead;
768769

0 commit comments

Comments
 (0)