From cfa4550f926e7a07757853f94273f2d1589cb9d3 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Mon, 27 Jan 2020 19:01:48 +0100 Subject: [PATCH 077/116] virtiofsd: rename unref_inode() to unref_inode_lolocked() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Dr. David Alan Gilbert Message-id: <20200127190227.40942-74-dgilbert@redhat.com> Patchwork-id: 93526 O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 073/112] virtiofsd: rename unref_inode() to unref_inode_lolocked() Bugzilla: 1694164 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Sergio Lopez Pascual From: Miklos Szeredi Signed-off-by: Miklos Szeredi Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé Signed-off-by: Dr. David Alan Gilbert (cherry picked from commit 95d2715791c60b5dc2d22e4eb7b83217273296fa) Signed-off-by: Miroslav Rezanina --- tools/virtiofsd/passthrough_ll.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 8b1784f..de12e75 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -148,8 +148,8 @@ static const struct fuse_opt lo_opts[] = { }; static bool use_syslog = false; static int current_log_level; - -static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64_t n); +static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode, + uint64_t n); static struct { pthread_mutex_t mutex; @@ -586,7 +586,7 @@ retry: return 0; fail_unref: - unref_inode(lo, p, 1); + unref_inode_lolocked(lo, p, 1); fail: if (retries) { retries--; @@ -624,7 +624,7 @@ fallback: res = lo_parent_and_name(lo, inode, path, &parent); if (res != -1) { res = utimensat(parent->fd, path, tv, AT_SYMLINK_NOFOLLOW); - unref_inode(lo, parent, 1); + unref_inode_lolocked(lo, parent, 1); } return res; @@ -1027,7 +1027,7 @@ fallback: res = lo_parent_and_name(lo, inode, path, &parent); if (res != -1) { res = linkat(parent->fd, path, dfd, name, 0); - unref_inode(lo, parent, 1); + unref_inode_lolocked(lo, parent, 1); } return res; @@ -1141,7 +1141,8 @@ static void lo_unlink(fuse_req_t req, fuse_ino_t parent, const char *name) fuse_reply_err(req, res == -1 ? errno : 0); } -static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64_t n) +static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode, + uint64_t n) { if (!inode) { return; @@ -1181,7 +1182,7 @@ static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup) (unsigned long long)ino, (unsigned long long)inode->refcount, (unsigned long long)nlookup); - unref_inode(lo, inode, nlookup); + unref_inode_lolocked(lo, inode, nlookup); } static void lo_forget(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup) -- 1.8.3.1