[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] virtiofsd: Add attr_flags to fuse_entry_param
From: |
Max Reitz |
Subject: |
[PATCH 3/8] virtiofsd: Add attr_flags to fuse_entry_param |
Date: |
Wed, 9 Sep 2020 20:40:23 +0200 |
fuse_entry_param is converted to fuse_attr on the line (by
fill_entry()), so it should have a member that mirrors fuse_attr.flags.
fill_entry() should then copy this fuse_entry_param.attr_flags to
fuse_attr.flags.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tools/virtiofsd/fuse_lowlevel.h | 5 +++++
tools/virtiofsd/fuse_lowlevel.c | 13 +++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowlevel.h
index 562fd5241e..9c06240f9e 100644
--- a/tools/virtiofsd/fuse_lowlevel.h
+++ b/tools/virtiofsd/fuse_lowlevel.h
@@ -102,6 +102,11 @@ struct fuse_entry_param {
* large value.
*/
double entry_timeout;
+
+ /**
+ * Flags for fuse_attr.flags that do not fit into attr.
+ */
+ uint32_t attr_flags;
};
/**
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index e9e2652d33..3ca49456c3 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -329,7 +329,8 @@ static unsigned int calc_timeout_nsec(double t)
}
}
-static void fill_entry(struct fuse_entry_out *arg,
+static void fill_entry(struct fuse_session *se,
+ struct fuse_entry_out *arg,
const struct fuse_entry_param *e)
{
*arg = (struct fuse_entry_out){
@@ -341,6 +342,10 @@ static void fill_entry(struct fuse_entry_out *arg,
.attr_valid_nsec = calc_timeout_nsec(e->attr_timeout),
};
convert_stat(&e->attr, &arg->attr);
+
+ if (se->conn.capable & FUSE_CAP_ATTR_FLAGS) {
+ arg->attr.flags = e->attr_flags;
+ }
}
/*
@@ -365,7 +370,7 @@ size_t fuse_add_direntry_plus(fuse_req_t req, char *buf,
size_t bufsize,
struct fuse_direntplus *dp = (struct fuse_direntplus *)buf;
memset(&dp->entry_out, 0, sizeof(dp->entry_out));
- fill_entry(&dp->entry_out, e);
+ fill_entry(req->se, &dp->entry_out, e);
struct fuse_dirent *dirent = &dp->dirent;
*dirent = (struct fuse_dirent){
@@ -403,7 +408,7 @@ int fuse_reply_entry(fuse_req_t req, const struct
fuse_entry_param *e)
size_t size = sizeof(arg);
memset(&arg, 0, sizeof(arg));
- fill_entry(&arg, e);
+ fill_entry(req->se, &arg, e);
return send_reply_ok(req, &arg, size);
}
@@ -416,7 +421,7 @@ int fuse_reply_create(fuse_req_t req, const struct
fuse_entry_param *e,
struct fuse_open_out *oarg = (struct fuse_open_out *)(buf + entrysize);
memset(buf, 0, sizeof(buf));
- fill_entry(earg, e);
+ fill_entry(req->se, earg, e);
fill_open(oarg, f);
return send_reply_ok(req, buf, entrysize + sizeof(struct fuse_open_out));
}
--
2.26.2
- [PATCH 0/8] virtiofsd: Announce submounts to the guest, Max Reitz, 2020/09/09
- [PATCH 1/8] linux/fuse.h: Pull in from Linux, Max Reitz, 2020/09/09
- [PATCH 2/8] virtiofsd: Announce FUSE_ATTR_FLAGS, Max Reitz, 2020/09/09
- [PATCH 3/8] virtiofsd: Add attr_flags to fuse_entry_param,
Max Reitz <=
- [PATCH 4/8] virtiofsd: Add fuse_reply_attr_with_flags(), Max Reitz, 2020/09/09
- [PATCH 5/8] virtiofsd: Store every lo_inode's parent_dev, Max Reitz, 2020/09/09
- [PATCH 7/8] tests/acceptance/boot_linux: Accept SSH pubkey, Max Reitz, 2020/09/09
- [PATCH 6/8] virtiofsd: Announce sub-mount points, Max Reitz, 2020/09/09
- [PATCH 8/8] tests/acceptance: Add virtiofs_submounts.py, Max Reitz, 2020/09/09
- Re: [PATCH 0/8] virtiofsd: Announce submounts to the guest, Stefan Hajnoczi, 2020/09/11