commit c22d81440b2e81a28afa9fdecc590d825bfc22f7
author Ryo Hashimoto <hashimoto@google.com> Fri Mar 16 04:43:28 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 16 04:43:28 2018 +0000
tree dd3b4563885f5960cd08c6581a7bccef3d76d94e
parent 14f283a1f53cbaf4c696473bee36365f7f7fee3c
parent 10cec807e13ec2c569c5be3e4bf5fb15b078ee81

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

Change-Id: I3dc8cf106e887567a06cb5e7d2e526df92a7795b

libappfuse/FuseBuffer.cc

diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc
index 1eab46c..1915f22 100644
--- a/libappfuse/FuseBuffer.cc
+++ b/libappfuse/FuseBuffer.cc
@@ -149,8 +149,8 @@
     }
 
     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

diff --git a/libappfuse/include/libappfuse/FuseBuffer.h b/libappfuse/include/libappfuse/FuseBuffer.h
index 7a70bf3..3063815 100644
--- a/libappfuse/include/libappfuse/FuseBuffer.h
+++ b/libappfuse/include/libappfuse/FuseBuffer.h
@@ -25,7 +25,7 @@
 
 // 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;