diff options
| author | Zim <zezeozue@google.com> | 2020-01-10 14:56:15 +0000 |
|---|---|---|
| committer | Zim <zezeozue@google.com> | 2020-01-10 16:28:23 +0000 |
| commit | 29c1808ed132bd003b34166912d9da0dcccc4e83 (patch) | |
| tree | c7343107736f5b34e9b76d33f83c45d3462fd061 /lib | |
| parent | 1614f394fb59a7e1f0669fd1adfc385e3384023c (diff) | |
| download | libfuse-29c1808ed132bd003b34166912d9da0dcccc4e83.tar.gz | |
Support FUSE_CANONICAL_PATH in libfuse
FUSE_CANONICAL_PATH opcode, (2016) was added in some Android
kernels to support inotify. Add canonical path handlers in libfuse and
create a patch file to easily apply this patch on top of updates.
Test: inotify - /sdcard on Taimen
Test: atest FileObserver
Bug: 147482155
Change-Id: I97a2c4247aa3e4a70af697569b56662a0755f72b
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse_lowlevel.c | 16 | ||||
| -rw-r--r-- | lib/fuse_versionscript | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index f2d7038..334b497 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -450,6 +450,11 @@ int fuse_reply_readlink(fuse_req_t req, const char *linkname) return send_reply_ok(req, linkname, strlen(linkname)); } +int fuse_reply_canonical_path(fuse_req_t req, const char *path) +{ + return send_reply_ok(req, path, strlen(path)); +} + int fuse_reply_open(fuse_req_t req, const struct fuse_file_info *f) { struct fuse_open_out arg; @@ -1202,6 +1207,16 @@ static void do_readlink(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) fuse_reply_err(req, ENOSYS); } +static void do_canonical_path(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) +{ + (void) inarg; + + if (req->se->op.canonical_path) + req->se->op.canonical_path(req, nodeid); + else + fuse_reply_err(req, ENOSYS); +} + static void do_mknod(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) { struct fuse_mknod_in *arg = (struct fuse_mknod_in *) inarg; @@ -2456,6 +2471,7 @@ static struct { [FUSE_GETATTR] = { do_getattr, "GETATTR" }, [FUSE_SETATTR] = { do_setattr, "SETATTR" }, [FUSE_READLINK] = { do_readlink, "READLINK" }, + [FUSE_CANONICAL_PATH] = { do_canonical_path, "CANONICAL_PATH" }, [FUSE_SYMLINK] = { do_symlink, "SYMLINK" }, [FUSE_MKNOD] = { do_mknod, "MKNOD" }, [FUSE_MKDIR] = { do_mkdir, "MKDIR" }, diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index d18ba29..4c075a3 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -163,6 +163,7 @@ FUSE_3.7 { global: fuse_set_log_func; fuse_log; + fuse_reply_canonical_path; } FUSE_3.3; # Local Variables: |