commit 55cec5870328ea18efacce81fa6e652066fdcc5d
author Thierry Strudel <tstrudel@google.com> Mon Sep 26 21:25:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 26 21:25:32 2016 +0000
tree 88d24d741302cdd1480b81296d48965a66a17f50
parent 3cca209b912af721746871a6fc1a48a1fc6985ec
parent 5f4db94228f1d414b38771d933b778920510ef0a

[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available am: 738e0dcf0a
am: 5f4db94228

Change-Id: I05fbf1cffb44595d354219b1753cd7c2b37e10db

sdcard/fuse.cpp

diff --git a/sdcard/fuse.cpp b/sdcard/fuse.cpp
index f549606..b24c0d4 100644
--- a/sdcard/fuse.cpp
+++ b/sdcard/fuse.cpp
@@ -1011,7 +1011,13 @@
     }
     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 @@
     }
     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 @@
     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;