commit 08f30f9b17ae396276b80db8edc88ca190e015e9
author Robb Glasser <rglasser@google.com> Mon Sep 26 21:15:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 26 21:15:24 2016 +0000
tree 92ee5463332f66fe14c427a1017824a9b7fd2f6a
parent aaca841156e828e00cfaf258b982776b1fd2a3e4
parent bafb64dda617335d484ec4c1ddd42543c174a296

Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into nyc-mr1-dev

sdcard/sdcard.c

diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 9480e4a..13ebaf1 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1221,7 +1221,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;
 }
@@ -1385,7 +1391,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;
 }
@@ -1467,6 +1479,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;