diff options
| author | Csaba Henk <csaba@redhat.com> | 2020-10-15 21:06:16 +0200 |
|---|---|---|
| committer | Xavi Hernandez <xhernandez@users.noreply.github.com> | 2020-12-15 12:04:53 +0100 |
| commit | 459c5a004137123c6529124a1596b4cccaccbee7 (patch) | |
| tree | f3986f116a8f0427afe1a3511173201f6736fa64 | |
| parent | 14d0f9b32693402695544fa0a0ba772252876784 (diff) | |
| download | glusterfs-459c5a004137123c6529124a1596b4cccaccbee7.tar.gz glusterfs-459c5a004137123c6529124a1596b4cccaccbee7.tar.xz glusterfs-459c5a004137123c6529124a1596b4cccaccbee7.zip | |
fuse: render gfid only once in fuse_invalidate_entry()
Change-Id: I6073489a8308c6f518438d2ad2348a0c4cd5f805
Fixes: #1545
Signed-off-by: Csaba Henk <csaba@redhat.com>
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 36e84bb0b1..927a7749da 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -430,6 +430,8 @@ fuse_invalidate_entry(xlator_t *this, uint64_t fuse_ino) inode = (inode_t *)(unsigned long)fuse_ino; if (inode == NULL) return -1; + /* for diagnostic purposes */ + uuid_utoa_r(inode->gfid, gfid_str); list_for_each_entry_safe(dentry, tmp, &inode->dentry_list, inode_list) { @@ -466,16 +468,16 @@ fuse_invalidate_entry(xlator_t *this, uint64_t fuse_ino) gf_log("glusterfs-fuse", GF_LOG_TRACE, "INVALIDATE entry: %" PRIu64 "/%s (gfid:%s)", fnieo->parent, - dentry->name, uuid_utoa(inode->gfid)); + dentry->name, gfid_str); if (dentry->parent) { fuse_log_eh(this, "Invalidated entry %s (parent: %s) gfid:%s", dentry->name, uuid_utoa(dentry->parent->gfid), - uuid_utoa_r(inode->gfid, gfid_str)); + gfid_str); } else { fuse_log_eh(this, "Invalidated entry %s(nodeid: %" PRIu64 ") gfid:%s", - dentry->name, fnieo->parent, uuid_utoa(inode->gfid)); + dentry->name, fnieo->parent, gfid_str); } pthread_mutex_lock(&priv->invalidate_mutex); |