commit 7cabb06a25ab358c1cee74976ff9777b4028a533
author Thierry Strudel <tstrudel@google.com> Thu Jan 14 00:48:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 14 00:48:29 2016 +0000
tree 44f95135bb7888830be9e07efe8648dd68303131
parent 06b50c3637473b73e1640378483a334dbe252dfc
parent c464e9080151bb3ebd59bd17282c2c5be9ea3490

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

* commit 'b84295d027c9d86720d93e19eb5c1b644553d647':
  [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available

sdcard/sdcard.c

diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 06452aa..e9aa770 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1214,7 +1214,13 @@
     }
     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 @@
     }
     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 @@
     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;