diff options
| author | Daichi Hirono <hirono@google.com> | 2016-11-16 07:54:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 07:54:10 +0000 |
| commit | 357876455cb687b815daa9932d1b869b9c701a91 (patch) | |
| tree | 094c1f269625216c34cf2451e6bbf6122e75bad5 /sdcard | |
| parent | b6a8454cd5a15234c961aa1a95fbf80a9f6b18b1 (diff) | |
| parent | 0673412bb962a2c92830e903acf442506d092ebc (diff) | |
| download | system_core-357876455cb687b815daa9932d1b869b9c701a91.tar.gz system_core-357876455cb687b815daa9932d1b869b9c701a91.tar.bz2 system_core-357876455cb687b815daa9932d1b869b9c701a91.zip | |
Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT."
am: 0673412bb9
Change-Id: I85e6be67fdd5285c2abc26a097301c7136a676f9
Diffstat (limited to 'sdcard')
| -rw-r--r-- | sdcard/fuse.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sdcard/fuse.cpp b/sdcard/fuse.cpp index 4f1ca0d91..3f0f95fe2 100644 --- a/sdcard/fuse.cpp +++ b/sdcard/fuse.cpp @@ -1274,12 +1274,9 @@ static int handle_init(struct fuse* fuse, struct fuse_handler* handler, #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 (req->minor <= 22) { - fuse_struct_size = FUSE_COMPAT_22_INIT_OUT_SIZE; - } + /* Since we return minor version 15, the kernel does not accept the latest + * fuse_init_out size. We need to use FUSE_COMPAT_22_INIT_OUT_SIZE always.*/ + fuse_struct_size = FUSE_COMPAT_22_INIT_OUT_SIZE; #endif out.major = FUSE_KERNEL_VERSION; |