diff options
| author | Daichi Hirono <hirono@google.com> | 2016-11-10 09:41:54 +0900 |
|---|---|---|
| committer | Daichi Hirono <hirono@google.com> | 2016-11-16 01:56:00 +0000 |
| commit | 471ad6a59d4ab765a5e93d5dd557057e88858974 (patch) | |
| tree | 2cba6ec0c0772b8ebb049df9e2383cc55f90d5cc /libappfuse | |
| parent | b5ce6f02dd11b42c03884dd9531c6c8a80bcecda (diff) | |
| download | core-471ad6a59d4ab765a5e93d5dd557057e88858974.tar.gz | |
Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available.
We return the minor version number 15 to FUSE_INIT since we don't handle
BATCH_FORGET. Thus the kernel does not accept the latest size of
fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE.
Bug: 32779923
Test: libappfuse_test
Change-Id: I5c979d0e45344ca8adfe3ad3f4a9561442abcb3a
Diffstat (limited to 'libappfuse')
| -rw-r--r-- | libappfuse/FuseBuffer.cc | 15 | ||||
| -rw-r--r-- | libappfuse/tests/FuseBufferTest.cc | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc index 45280a5cf..5f4c1f843 100644 --- a/libappfuse/FuseBuffer.cc +++ b/libappfuse/FuseBuffer.cc @@ -101,23 +101,18 @@ void FuseBuffer::HandleInit() { return; } - // We limit ourselves to 15 because we don't handle BATCH_FORGET yet - size_t response_size = sizeof(fuse_init_out); + // We limit ourselves to minor=15 because we don't handle BATCH_FORGET yet. + // Thus we need to use FUSE_COMPAT_22_INIT_OUT_SIZE. #if defined(FUSE_COMPAT_22_INIT_OUT_SIZE) // FUSE_KERNEL_VERSION >= 23. - - // If the kernel only works on minor revs older than or equal to 22, - // then use the older structure size since this code only uses the 7.22 - // version of the structure. - if (minor <= 22) { - response_size = FUSE_COMPAT_22_INIT_OUT_SIZE; - } + const size_t response_size = FUSE_COMPAT_22_INIT_OUT_SIZE; +#else + const size_t response_size = sizeof(fuse_init_out); #endif response.Reset(response_size, kFuseSuccess, unique); fuse_init_out* const out = &response.init_out; out->major = FUSE_KERNEL_VERSION; - // We limit ourselves to 15 because we don't handle BATCH_FORGET yet. out->minor = std::min(minor, 15u); out->max_readahead = max_readahead; out->flags = FUSE_ATOMIC_O_TRUNC | FUSE_BIG_WRITES; diff --git a/libappfuse/tests/FuseBufferTest.cc b/libappfuse/tests/FuseBufferTest.cc index 1aacfe303..7f42845b4 100644 --- a/libappfuse/tests/FuseBufferTest.cc +++ b/libappfuse/tests/FuseBufferTest.cc @@ -163,7 +163,7 @@ TEST(FuseBufferTest, HandleInit) { buffer.HandleInit(); - ASSERT_EQ(sizeof(fuse_out_header) + sizeof(fuse_init_out), + ASSERT_EQ(sizeof(fuse_out_header) + FUSE_COMPAT_22_INIT_OUT_SIZE, buffer.response.header.len); EXPECT_EQ(kFuseSuccess, buffer.response.header.error); EXPECT_EQ(static_cast<unsigned int>(FUSE_KERNEL_VERSION), |