|
 |
1d442bb |
From: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
1d442bb |
Date: Mon, 27 Jan 2020 19:01:48 +0000
|
|
|
1d442bb |
Subject: [PATCH] virtiofsd: rename unref_inode() to unref_inode_lolocked()
|
|
|
1d442bb |
MIME-Version: 1.0
|
|
|
1d442bb |
Content-Type: text/plain; charset=UTF-8
|
|
|
1d442bb |
Content-Transfer-Encoding: 8bit
|
|
|
1d442bb |
|
|
|
1d442bb |
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
1d442bb |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1d442bb |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
1d442bb |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1d442bb |
(cherry picked from commit 95d2715791c60b5dc2d22e4eb7b83217273296fa)
|
|
|
1d442bb |
---
|
|
|
1d442bb |
tools/virtiofsd/passthrough_ll.c | 15 ++++++++-------
|
|
|
1d442bb |
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
1d442bb |
|
|
|
1d442bb |
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
index 8b1784ff7b..de12e75a9e 100644
|
|
|
1d442bb |
--- a/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
|
1d442bb |
@@ -148,8 +148,8 @@ static const struct fuse_opt lo_opts[] = {
|
|
|
1d442bb |
};
|
|
|
1d442bb |
static bool use_syslog = false;
|
|
|
1d442bb |
static int current_log_level;
|
|
|
1d442bb |
-
|
|
|
1d442bb |
-static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64_t n);
|
|
|
1d442bb |
+static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode,
|
|
|
1d442bb |
+ uint64_t n);
|
|
|
1d442bb |
|
|
|
1d442bb |
static struct {
|
|
|
1d442bb |
pthread_mutex_t mutex;
|
|
|
1d442bb |
@@ -586,7 +586,7 @@ retry:
|
|
|
1d442bb |
return 0;
|
|
|
1d442bb |
|
|
|
1d442bb |
fail_unref:
|
|
|
1d442bb |
- unref_inode(lo, p, 1);
|
|
|
1d442bb |
+ unref_inode_lolocked(lo, p, 1);
|
|
|
1d442bb |
fail:
|
|
|
1d442bb |
if (retries) {
|
|
|
1d442bb |
retries--;
|
|
|
1d442bb |
@@ -624,7 +624,7 @@ fallback:
|
|
|
1d442bb |
res = lo_parent_and_name(lo, inode, path, &parent);
|
|
|
1d442bb |
if (res != -1) {
|
|
|
1d442bb |
res = utimensat(parent->fd, path, tv, AT_SYMLINK_NOFOLLOW);
|
|
|
1d442bb |
- unref_inode(lo, parent, 1);
|
|
|
1d442bb |
+ unref_inode_lolocked(lo, parent, 1);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
return res;
|
|
|
1d442bb |
@@ -1027,7 +1027,7 @@ fallback:
|
|
|
1d442bb |
res = lo_parent_and_name(lo, inode, path, &parent);
|
|
|
1d442bb |
if (res != -1) {
|
|
|
1d442bb |
res = linkat(parent->fd, path, dfd, name, 0);
|
|
|
1d442bb |
- unref_inode(lo, parent, 1);
|
|
|
1d442bb |
+ unref_inode_lolocked(lo, parent, 1);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
return res;
|
|
|
1d442bb |
@@ -1141,7 +1141,8 @@ static void lo_unlink(fuse_req_t req, fuse_ino_t parent, const char *name)
|
|
|
1d442bb |
fuse_reply_err(req, res == -1 ? errno : 0);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
-static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64_t n)
|
|
|
1d442bb |
+static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode,
|
|
|
1d442bb |
+ uint64_t n)
|
|
|
1d442bb |
{
|
|
|
1d442bb |
if (!inode) {
|
|
|
1d442bb |
return;
|
|
|
1d442bb |
@@ -1181,7 +1182,7 @@ static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup)
|
|
|
1d442bb |
(unsigned long long)ino, (unsigned long long)inode->refcount,
|
|
|
1d442bb |
(unsigned long long)nlookup);
|
|
|
1d442bb |
|
|
|
1d442bb |
- unref_inode(lo, inode, nlookup);
|
|
|
1d442bb |
+ unref_inode_lolocked(lo, inode, nlookup);
|
|
|
1d442bb |
}
|
|
|
1d442bb |
|
|
|
1d442bb |
static void lo_forget(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup)
|