168 lines
5.1 KiB
Diff
168 lines
5.1 KiB
Diff
From 596e74a63aec8cbb416d7421d4f6810ee4ae084b Mon Sep 17 00:00:00 2001
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
|
Date: Wed, 10 Feb 2021 00:02:15 -0500
|
|
Subject: [PATCH 1/3] virtiofsd: extract lo_do_open() from lo_open()
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
Message-id: <20210210000217.1561306-2-jmaloy@redhat.com>
|
|
Patchwork-id: 101025
|
|
O-Subject: [RHEL-8.3.0.z qemu-kvm PATCH 1/3] virtiofsd: extract lo_do_open() from lo_open()
|
|
Bugzilla: 1919109
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
|
Both lo_open() and lo_create() have similar code to open a file. Extract
|
|
a common lo_do_open() function from lo_open() that will be used by
|
|
lo_create() in a later commit.
|
|
|
|
Since lo_do_open() does not otherwise need fuse_req_t req, convert
|
|
lo_add_fd_mapping() to use struct lo_data *lo instead.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-Id: <20210204150208.367837-2-stefanha@redhat.com>
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
(cherry-picked from commit 8afaaee976965b7fb90ec225a51d60f35c5f173c)
|
|
|
|
Conflict: update_open_flags() takes fewer arguments in this version
|
|
than in upstream. Instead of applying commit e12a0edafeb
|
|
("virtiofsd: Add -o allow_direct_io|no_allow_direct_io
|
|
options") we keep the old signature, since this seems to
|
|
be an unrelated change.
|
|
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Jon Maloy <jmaloy.redhat.com>
|
|
---
|
|
tools/virtiofsd/passthrough_ll.c | 73 ++++++++++++++++++++------------
|
|
1 file changed, 46 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
index f41a6b07c8..518ba11c47 100644
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
@@ -439,17 +439,17 @@ static void lo_map_remove(struct lo_map *map, size_t key)
|
|
}
|
|
|
|
/* Assumes lo->mutex is held */
|
|
-static ssize_t lo_add_fd_mapping(fuse_req_t req, int fd)
|
|
+static ssize_t lo_add_fd_mapping(struct lo_data *lo, int fd)
|
|
{
|
|
struct lo_map_elem *elem;
|
|
|
|
- elem = lo_map_alloc_elem(&lo_data(req)->fd_map);
|
|
+ elem = lo_map_alloc_elem(&lo->fd_map);
|
|
if (!elem) {
|
|
return -1;
|
|
}
|
|
|
|
elem->fd = fd;
|
|
- return elem - lo_data(req)->fd_map.elems;
|
|
+ return elem - lo->fd_map.elems;
|
|
}
|
|
|
|
/* Assumes lo->mutex is held */
|
|
@@ -1712,6 +1712,38 @@ static void update_open_flags(int writeback, struct fuse_file_info *fi)
|
|
fi->flags &= ~O_DIRECT;
|
|
}
|
|
|
|
+static int lo_do_open(struct lo_data *lo, struct lo_inode *inode,
|
|
+ struct fuse_file_info *fi)
|
|
+{
|
|
+ char buf[64];
|
|
+ ssize_t fh;
|
|
+ int fd;
|
|
+
|
|
+ update_open_flags(lo->writeback, fi);
|
|
+
|
|
+ sprintf(buf, "%i", inode->fd);
|
|
+ fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
|
|
+ if (fd == -1) {
|
|
+ return errno;
|
|
+ }
|
|
+
|
|
+ pthread_mutex_lock(&lo->mutex);
|
|
+ fh = lo_add_fd_mapping(lo, fd);
|
|
+ pthread_mutex_unlock(&lo->mutex);
|
|
+ if (fh == -1) {
|
|
+ close(fd);
|
|
+ return ENOMEM;
|
|
+ }
|
|
+
|
|
+ fi->fh = fh;
|
|
+ if (lo->cache == CACHE_NONE) {
|
|
+ fi->direct_io = 1;
|
|
+ } else if (lo->cache == CACHE_ALWAYS) {
|
|
+ fi->keep_cache = 1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
|
|
mode_t mode, struct fuse_file_info *fi)
|
|
{
|
|
@@ -1752,7 +1784,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
|
|
ssize_t fh;
|
|
|
|
pthread_mutex_lock(&lo->mutex);
|
|
- fh = lo_add_fd_mapping(req, fd);
|
|
+ fh = lo_add_fd_mapping(lo, fd);
|
|
pthread_mutex_unlock(&lo->mutex);
|
|
if (fh == -1) {
|
|
close(fd);
|
|
@@ -1943,38 +1975,25 @@ static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync,
|
|
|
|
static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
|
|
{
|
|
- int fd;
|
|
- ssize_t fh;
|
|
- char buf[64];
|
|
struct lo_data *lo = lo_data(req);
|
|
+ struct lo_inode *inode = lo_inode(req, ino);
|
|
+ int err;
|
|
|
|
fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=%" PRIu64 ", flags=%d)\n", ino,
|
|
fi->flags);
|
|
|
|
- update_open_flags(lo->writeback, fi);
|
|
-
|
|
- sprintf(buf, "%i", lo_fd(req, ino));
|
|
- fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
|
|
- if (fd == -1) {
|
|
- return (void)fuse_reply_err(req, errno);
|
|
- }
|
|
-
|
|
- pthread_mutex_lock(&lo->mutex);
|
|
- fh = lo_add_fd_mapping(req, fd);
|
|
- pthread_mutex_unlock(&lo->mutex);
|
|
- if (fh == -1) {
|
|
- close(fd);
|
|
- fuse_reply_err(req, ENOMEM);
|
|
+ if (!inode) {
|
|
+ fuse_reply_err(req, EBADF);
|
|
return;
|
|
}
|
|
|
|
- fi->fh = fh;
|
|
- if (lo->cache == CACHE_NONE) {
|
|
- fi->direct_io = 1;
|
|
- } else if (lo->cache == CACHE_ALWAYS) {
|
|
- fi->keep_cache = 1;
|
|
+ err = lo_do_open(lo, inode, fi);
|
|
+ lo_inode_put(lo, &inode);
|
|
+ if (err) {
|
|
+ fuse_reply_err(req, err);
|
|
+ } else {
|
|
+ fuse_reply_open(req, fi);
|
|
}
|
|
- fuse_reply_open(req, fi);
|
|
}
|
|
|
|
static void lo_release(fuse_req_t req, fuse_ino_t ino,
|
|
--
|
|
2.18.2
|
|
|