From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/client/Inode.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/client/Inode.h') diff --git a/src/client/Inode.h b/src/client/Inode.h index d28ff2e08..a2f6c15be 100644 --- a/src/client/Inode.h +++ b/src/client/Inode.h @@ -97,9 +97,6 @@ struct CapSnap { bool writing = false, dirty_data = false; uint64_t flush_tid = 0; - int64_t cap_dirtier_uid = -1; - int64_t cap_dirtier_gid = -1; - explicit CapSnap(Inode *i) : in(i) {} @@ -252,6 +249,7 @@ struct Inode : RefCountedObject { void make_long_path(filepath& p); void make_short_path(filepath& p); + bool make_path_string(std::string& s); void make_nosnap_relative_path(filepath& p); // The ref count. 1 for each dentry, fh, inode_map, -- cgit v1.2.3