[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/16] virtiofsd: Add attr_flags to fuse_entry_param
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 11/16] virtiofsd: Add attr_flags to fuse_entry_param |
Date: |
Mon, 26 Oct 2020 18:43:26 +0000 |
From: Max Reitz <mreitz@redhat.com>
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>
Message-Id: <20200909184028.262297-4-mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/virtiofsd/fuse_lowlevel.c | 13 +++++++++----
tools/virtiofsd/fuse_lowlevel.h | 5 +++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 8679594255..00da84432c 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));
}
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;
};
/**
--
2.28.0
- [PULL 00/16] virtiofs queue, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 01/16] configure: add option for virtiofsd, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 02/16] virtiofsd: passthrough_ll: set FUSE_LOG_INFO as default log_level, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 03/16] virtiofsd: add container-friendly -o sandbox=chroot option, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 04/16] tools/virtiofsd: xattr name mappings: Add option, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 05/16] tools/virtiofsd: xattr name mappings: Map client xattr names, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 07/16] tools/virtiofsd: xattr name mapping examples, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 06/16] tools/virtiofsd: xattr name mappings: Map server xattr names, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 08/16] tools/virtiofsd: xattr name mappings: Simple 'map', Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 09/16] linux/fuse.h: Pull in from Linux, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 11/16] virtiofsd: Add attr_flags to fuse_entry_param,
Dr. David Alan Gilbert (git) <=
- [PULL 10/16] virtiofsd: Announce FUSE_ATTR_FLAGS, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 13/16] virtiofsd: Store every lo_inode's parent_dev, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 12/16] virtiofsd: Add fuse_reply_attr_with_flags(), Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 14/16] virtiofsd: Announce sub-mount points, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 15/16] tests/acceptance/boot_linux: Accept SSH pubkey, Dr. David Alan Gilbert (git), 2020/10/26
- [PULL 16/16] tests/acceptance: Add virtiofs_submounts.py, Dr. David Alan Gilbert (git), 2020/10/26
- Re: [PULL 00/16] virtiofs queue, Peter Maydell, 2020/10/27