ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Robb Glasser 2016-09-26 21:15:24 +00:00 • committed by Android (Google) Code Review
commit bba43b374b
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sdcard/sdcard.c
View file

@ -1221,7 +1221,13 @@ static int handle_open(struct fuse* fuse, struct fuse_handler* handler,
} }
out.fh = ptr_to_id(h); out.fh = ptr_to_id(h);
out.open_flags = 0; out.open_flags = 0;
#ifdef FUSE_SHORTCIRCUIT
out.lower_fd = h->fd;
#else
out.padding = 0; out.padding = 0;
#endif
fuse_reply(fuse, hdr->unique, &out, sizeof(out)); fuse_reply(fuse, hdr->unique, &out, sizeof(out));
return NO_STATUS; return NO_STATUS;
} }
@ -1385,7 +1391,13 @@ static int handle_opendir(struct fuse* fuse, struct fuse_handler* handler,
} }
out.fh = ptr_to_id(h); out.fh = ptr_to_id(h);
out.open_flags = 0; out.open_flags = 0;
#ifdef FUSE_SHORTCIRCUIT
out.lower_fd = -1;
#else
out.padding = 0; out.padding = 0;
#endif
fuse_reply(fuse, hdr->unique, &out, sizeof(out)); fuse_reply(fuse, hdr->unique, &out, sizeof(out));
return NO_STATUS; return NO_STATUS;
} }
@ -1467,6 +1479,11 @@ static int handle_init(struct fuse* fuse, struct fuse_handler* handler,
out.major = FUSE_KERNEL_VERSION; out.major = FUSE_KERNEL_VERSION;
out.max_readahead = req->max_readahead; out.max_readahead = req->max_readahead;
out.flags = FUSE_ATOMIC_O_TRUNC | FUSE_BIG_WRITES; out.flags = FUSE_ATOMIC_O_TRUNC | FUSE_BIG_WRITES;
#ifdef FUSE_SHORTCIRCUIT
out.flags |= FUSE_SHORTCIRCUIT;
#endif
out.max_background = 32; out.max_background = 32;
out.congestion_threshold = 32; out.congestion_threshold = 32;
out.max_write = MAX_WRITE; out.max_write = MAX_WRITE;