[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 013/104] virtiofsd: Make fsync work even if only inode is passed
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PATCH 013/104] virtiofsd: Make fsync work even if only inode is passed in |
Date: |
Thu, 12 Dec 2019 16:37:33 +0000 |
From: Vivek Goyal <address@hidden>
If caller has not sent file handle in request, then using inode, retrieve
the fd opened using O_PATH and use that to open file again and issue
fsync. This will be needed when dax_flush() calls fsync. At that time
we only have inode information (and not file).
Signed-off-by: Vivek Goyal <address@hidden>
---
tools/virtiofsd/fuse_lowlevel.c | 6 +++++-
tools/virtiofsd/passthrough_ll.c | 28 ++++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index f4bd303a7a..167701b453 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -1077,7 +1077,11 @@ static void do_fsync(fuse_req_t req, fuse_ino_t nodeid,
const void *inarg)
fi.fh = arg->fh;
if (req->se->op.fsync) {
- req->se->op.fsync(req, nodeid, datasync, &fi);
+ if (fi.fh == (uint64_t)-1) {
+ req->se->op.fsync(req, nodeid, datasync, NULL);
+ } else {
+ req->se->op.fsync(req, nodeid, datasync, &fi);
+ }
} else {
fuse_reply_err(req, ENOSYS);
}
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 0e543353a4..cd6a0f4409 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -903,10 +903,34 @@ static void lo_fsync(fuse_req_t req, fuse_ino_t ino, int
datasync,
{
int res;
(void)ino;
+ int fd;
+ char *buf;
+
+ fuse_log(FUSE_LOG_DEBUG, "lo_fsync(ino=%" PRIu64 ", fi=0x%p)\n", ino,
+ (void *)fi);
+
+ if (!fi) {
+ res = asprintf(&buf, "/proc/self/fd/%i", lo_fd(req, ino));
+ if (res == -1) {
+ return (void)fuse_reply_err(req, errno);
+ }
+
+ fd = open(buf, O_RDWR);
+ free(buf);
+ if (fd == -1) {
+ return (void)fuse_reply_err(req, errno);
+ }
+ } else {
+ fd = fi->fh;
+ }
+
if (datasync) {
- res = fdatasync(fi->fh);
+ res = fdatasync(fd);
} else {
- res = fsync(fi->fh);
+ res = fsync(fd);
+ }
+ if (!fi) {
+ close(fd);
}
fuse_reply_err(req, res == -1 ? errno : 0);
}
--
2.23.0
- [PATCH 000/104] virtiofs daemon [all], Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 002/104] virtiofsd: Pull in kernel's fuse.h, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 003/104] virtiofsd: Add auxiliary .c's, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 005/104] virtiofsd: Add passthrough_ll, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 008/104] virtiofsd: remove mountpoint dummy argument, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 006/104] virtiofsd: Trim down imported files, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 009/104] virtiofsd: remove unused notify reply support, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 004/104] virtiofsd: Add fuse_lowlevel.c, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 011/104] virtiofsd: Fix common header and define for QEMU builds, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 013/104] virtiofsd: Make fsync work even if only inode is passed in,
Dr. David Alan Gilbert (git) <=
- [PATCH 014/104] virtiofsd: Add options for virtio, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 015/104] virtiofsd: add -o source=PATH to help output, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 017/104] virtiofsd: Start wiring up vhost-user, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 016/104] virtiofsd: Open vhost connection instead of mounting, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 010/104] virtiofsd: Fix fuse_daemonize ignored return values, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 001/104] virtiofsd: Pull in upstream headers, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 012/104] virtiofsd: Trim out compatibility code, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 019/104] virtiofsd: get/set features callbacks, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 018/104] virtiofsd: Add main virtio loop, Dr. David Alan Gilbert (git), 2019/12/12
- [PATCH 021/104] virtiofsd: Poll kick_fd for queue, Dr. David Alan Gilbert (git), 2019/12/12