diff options
| author | Bill Yi <byi@google.com> | 2016-02-17 11:37:00 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2016-02-17 11:37:00 -0800 |
| commit | 4409f1446caa4eb06122d60c96573503b73ea84b (patch) | |
| tree | fb19c2b7bcc80736f595b762a3218bef23d1a876 /sdcard | |
| parent | 2773d4f96a8e9f06710e36f7c33459eeaa5cb23a (diff) | |
| parent | 4352ee87fd74b931d4b58192fb8974e91aa899d0 (diff) | |
| download | system_core-4409f1446caa4eb06122d60c96573503b73ea84b.tar.gz system_core-4409f1446caa4eb06122d60c96573503b73ea84b.tar.bz2 system_core-4409f1446caa4eb06122d60c96573503b73ea84b.zip | |
Merge commit '4352ee87fd74b931d4b58192fb8974e91aa899d0' into HEAD
Diffstat (limited to 'sdcard')
| -rw-r--r-- | sdcard/sdcard.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c index 45efe369e..f86256195 100644 --- a/sdcard/sdcard.c +++ b/sdcard/sdcard.c @@ -1214,7 +1214,13 @@ static int handle_open(struct fuse* fuse, struct fuse_handler* handler, } 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 @@ static int handle_opendir(struct fuse* fuse, struct fuse_handler* handler, } 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 @@ static int handle_init(struct fuse* fuse, struct fuse_handler* handler, 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; |