diff options
| author | Keiichi Watanabe <keiichiw@google.com> | 2023-12-06 13:50:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 13:50:17 +0000 |
| commit | 45be743976ef42001294b28c78aa39e90154f33c (patch) | |
| tree | f8afc105c7ac2daa7535564bbafc8fe95db435d5 | |
| parent | 322ffd4bfa18810ac7dab593b9039eefe24081ca (diff) | |
| parent | 42e2f2b351bcc55a6cffe1088dc8daab3e6b3093 (diff) | |
| download | MediaProvider-45be743976ef42001294b28c78aa39e90154f33c.tar.gz | |
Merge "Enable FUSE_CAP_PARALLEL_DIROPS" into main am: d6886aa1cc am: 8550530592 am: 42e2f2b351
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2856969
Change-Id: I2460419a5619e480997651721121c804f2ca12aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | jni/FuseDaemon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp index 6e6c6c431..1c81fbade 100644 --- a/jni/FuseDaemon.cpp +++ b/jni/FuseDaemon.cpp @@ -724,7 +724,7 @@ static void pf_init(void* userdata, struct fuse_conn_info* conn) { conn->want &= ~FUSE_CAP_AUTO_INVAL_DATA & ~FUSE_CAP_READDIRPLUS_AUTO; uint64_t mask = (FUSE_CAP_SPLICE_WRITE | FUSE_CAP_SPLICE_MOVE | FUSE_CAP_SPLICE_READ | FUSE_CAP_ASYNC_READ | FUSE_CAP_ATOMIC_O_TRUNC | FUSE_CAP_WRITEBACK_CACHE | - FUSE_CAP_EXPORT_SUPPORT | FUSE_CAP_FLOCK_LOCKS); + FUSE_CAP_EXPORT_SUPPORT | FUSE_CAP_FLOCK_LOCKS | FUSE_CAP_PARALLEL_DIROPS); bool disable_splice_write = false; if (fuse->passthrough) { |