aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitrii Merkurev <dimorinny@google.com>2022-06-30 14:49:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-30 14:49:24 +0000
commita299bc858394c9d86ff72abae7e5ba2ab76ea917 (patch)
treeca6a8d344a718ee37fcd420025fe16c9f02066b9
parentb62341d86b1db0e6a73e8521735b79d378ae2c85 (diff)
parent35fb2d2328f556e168ded3ac70487df653ba6d34 (diff)
downloadlibfuse-a299bc858394c9d86ff72abae7e5ba2ab76ea917.tar.gz
ANDROID: fuse-bpf: Take into account nodeid, timeouts and other attributes for backed_inode case am: 35fb2d2328main-16k
Original change: https://android-review.googlesource.com/c/platform/external/libfuse/+/2135317 Change-Id: I47d871c27aebd8e48f4a7c7404a6f7702969ea7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--lib/fuse_lowlevel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 2ede5f3..964462f 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -421,6 +421,7 @@ int fuse_reply_entry(fuse_req_t req, const struct fuse_entry_param* e) {
if (!e->ino && req->se->conn.proto_minor < 4) return fuse_reply_err(req, ENOENT);
memset(&arg, 0, sizeof(arg));
+ fill_entry(&arg, e);
if (extended_args) {
memset(&bpf_arg, 0, sizeof(bpf_arg));
@@ -435,7 +436,6 @@ int fuse_reply_entry(fuse_req_t req, const struct fuse_entry_param* e) {
return send_reply_ok(req, &arg_ext, size);
} else {
- fill_entry(&arg, e);
return send_reply_ok(req, &arg, size);
}
}