ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9 am: 357876455c

Browse source 
am: 5f7ed2dd60

Change-Id: I911e9d23eefbadb703b4e285bb61269086f4c147
This commit is contained in:
Daichi Hirono 2016-11-16 08:10:26 +00:00 • committed by android-build-merger
commit 2b73980091
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sdcard/fuse.cpp
View file

@ -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;