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

Commit 55cec587 authored by Thierry Strudel's avatar Thierry Strudel Committed by android-build-merger
Browse files

[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available am: 738e0dcf 

am: 5f4db942

Change-Id: I05fbf1cffb44595d354219b1753cd7c2b37e10db
parents 3cca209b 5f4db942

sdcard/fuse.cpp

+17 −0
Original line number Diff line number Diff line
@@ -1011,7 +1011,13 @@ static int handle_open(struct fuse* fuse, struct fuse_handler* handler, 
    }

    out.fh = ptr_to_id(h);

    out.open_flags = 0;



#ifdef FUSE_SHORTCIRCUIT

    out.lower_fd = h->fd;

#else

    out.padding = 0;

#endif



    fuse_reply(fuse, hdr->unique, &out, sizeof(out));

    return NO_STATUS;

}
@@ -1175,7 +1181,13 @@ static int handle_opendir(struct fuse* fuse, struct fuse_handler* handler, 
    }

    out.fh = ptr_to_id(h);

    out.open_flags = 0;



#ifdef FUSE_SHORTCIRCUIT

    out.lower_fd = -1;

#else

    out.padding = 0;

#endif



    fuse_reply(fuse, hdr->unique, &out, sizeof(out));

    return NO_STATUS;

}
@@ -1258,6 +1270,11 @@ static int handle_init(struct fuse* fuse, struct fuse_handler* handler, 
    out.major = FUSE_KERNEL_VERSION;

    out.max_readahead = req->max_readahead;

    out.flags = FUSE_ATOMIC_O_TRUNC | FUSE_BIG_WRITES;



#ifdef FUSE_SHORTCIRCUIT

    out.flags |= FUSE_SHORTCIRCUIT;

#endif



    out.max_background = 32;

    out.congestion_threshold = 32;

    out.max_write = MAX_WRITE;