Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f7ed2dd authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412b

am: 35787645

Change-Id: I242c3f8f7e65c78446bb145db6035e28287cd917
parents 11c19d9b 35787645
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -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) {
    /* 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;