diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-13 16:11:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-13 16:11:03 +0000 |
| commit | 48ea17ee4b4cc770738c7b667c2f545d375dc383 (patch) | |
| tree | 3e5075efec3f16265f9fe0bdf93d9bb0cdce7107 /lib | |
| parent | e4c57cf369c96c01f75a39f384704739f3524ad4 (diff) | |
| parent | 73ddf5dd6ea009d20177f6a2d7b80bdcacba0d10 (diff) | |
| download | libfuse-48ea17ee4b4cc770738c7b667c2f545d375dc383.tar.gz | |
Merge "Introduce API V2 for FUSE_PASSTHROUGH_OPEN" into sc-devandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse_lowlevel.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index baa6d2b..a4a4df0 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -463,6 +463,7 @@ enum { FUSE_PASSTHROUGH_API_UNAVAILABLE, FUSE_PASSTHROUGH_API_V0, FUSE_PASSTHROUGH_API_V1, + FUSE_PASSTHROUGH_API_V2, FUSE_PASSTHROUGH_API_STABLE, }; @@ -490,7 +491,14 @@ int fuse_passthrough_enable(fuse_req_t req, unsigned int fd) { switch (passthrough_version) { case FUSE_PASSTHROUGH_API_STABLE: /* There is not a stable API yet */ - passthrough_version = FUSE_PASSTHROUGH_API_V1; + passthrough_version = FUSE_PASSTHROUGH_API_V2; + case FUSE_PASSTHROUGH_API_V2: { + ret = ioctl(req->se->fd, FUSE_DEV_IOC_PASSTHROUGH_OPEN_V2, &fd); + if (ret == -1 && errno == ENOTTY) + passthrough_version = FUSE_PASSTHROUGH_API_V1; + else + break; + } case FUSE_PASSTHROUGH_API_V1: { struct fuse_passthrough_out_v0 out = {}; out.fd = fd; |