[Devel] [PATCH RHEL10 COMMIT] fs/fuse: use fi->nodeid in trace messages

[Konstantin Khorenko]

The commit is pushed to "branch-rh10-6.12.0-55.52.1.5.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.52.1.5.26.vz10
------>
commit e70d2e2a3515346524ec24b02568ce34ee01c6a5
Author: Liu Kui <kui.liu at virtuozzo.com>
Date:   Mon May 18 14:45:27 2026 +0200

    fs/fuse: use fi->nodeid in trace messages
    
    Remove the subtraction of FUSE_ROOT_ID from fi->inode in trace messages
    to maintain consistency with the rest of the kernel.
    
    https://virtuozzo.atlassian.net/browse/VSTOR-124254
    Fixes: 5a19728412f4 ("fs/fuse: revamp fuse_invalidate_files() to avoid
    blocking the userspace evloop")
    
    Signed-off-by: Liu Kui <kui.liu at virtuozzo.com>
    
    Feature: vStorage
---
 fs/fuse/inode.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index d627302da0b43..4c2822acfbaf8 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -620,12 +620,10 @@ static void fuse_inval_files_work(struct work_struct *w)
 	spin_unlock(&fc->lock);
 
 	while (!list_empty(&inval_files_list)) {
-		u64 nodeid;
 
 		fi = list_first_entry(&inval_files_list, struct fuse_inode, inval_files_entry);
 		list_del(&fi->inval_files_entry);
-		nodeid = get_node_id(&fi->inode) - FUSE_ROOT_ID;
-		fuse_ktrace(fc, "invalidate_file on [%llu] starts", nodeid);
+		fuse_ktrace(fc, "invalidate_file on [%llu] starts", fi->nodeid);
 
 		spin_lock(&fi->lock);
 		list_for_each_entry(ff, &fi->rw_files, rw_entry)
@@ -642,7 +640,7 @@ static void fuse_inval_files_work(struct work_struct *w)
 		wake_up_bit(&fi->state, FUSE_I_INVAL_FILES);
 		spin_unlock(&fi->lock);
 
-		fuse_ktrace(fc, "invalidate_file on [%llu] ends", nodeid);
+		fuse_ktrace(fc, "invalidate_file on [%llu] ends", fi->nodeid);
 		iput(&fi->inode);
 	}