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

Commit 6ca5dc8e authored by Ryo Hashimoto's avatar Ryo Hashimoto Committed by android-build-merger
Browse files

Merge "Stop using SO_SNDBUFFORCE" into pi-dev am: 4031e1a4 

am: baf79c1c

Change-Id: I3eb1c471d97bb8d83e04a65b646dce484176f00b
parents a910dac3 baf79c1c

libappfuse/FuseBuffer.cc

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ bool SetupMessageSockets(base::unique_fd (*result)[2]) { 
    }



    constexpr int kMaxMessageSize = sizeof(FuseBuffer);

    if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUFFORCE, &kMaxMessageSize, sizeof(int)) != 0 ||

        setsockopt(fds[1], SOL_SOCKET, SO_SNDBUFFORCE, &kMaxMessageSize, sizeof(int)) != 0) {

    if (setsockopt(fds[0], SOL_SOCKET, SO_SNDBUF, &kMaxMessageSize, sizeof(int)) != 0 ||

        setsockopt(fds[1], SOL_SOCKET, SO_SNDBUF, &kMaxMessageSize, sizeof(int)) != 0) {

        PLOG(ERROR) << "Failed to update buffer size for socket";

        return false;

    }

libappfuse/include/libappfuse/FuseBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace fuse { 


// The numbers came from sdcard.c.

// Maximum number of bytes to write/read in one request/one reply.

constexpr size_t kFuseMaxWrite = 256 * 1024;

constexpr size_t kFuseMaxWrite = 128 * 1024;

constexpr size_t kFuseMaxRead = 128 * 1024;

constexpr int32_t kFuseSuccess = 0;