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

Commit 234a846a authored by Thierry Strudel's avatar Thierry Strudel Committed by android-build-merger
Browse files

Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into mnc-dr1.5-dev am: b84295d0 

am: bbaa2b29

* commit 'bbaa2b29':
  [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
parents ccfb90d1 bbaa2b29

sdcard/sdcard.c

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

    out.fh = ptr_to_id(h);

    out.open_flags = 0;



#ifdef FUSE_STACKED_IO

    out.lower_fd = h->fd;

#else

    out.padding = 0;

#endif



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

    return NO_STATUS;

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

    out.fh = ptr_to_id(h);

    out.open_flags = 0;



#ifdef FUSE_STACKED_IO

    out.lower_fd = -1;

#else

    out.padding = 0;

#endif



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

    return NO_STATUS;

}
@@ -1460,6 +1472,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_STACKED_IO

    out.flags |= FUSE_STACKED_IO;

#endif



    out.max_background = 32;

    out.congestion_threshold = 32;

    out.max_write = MAX_WRITE;