lib/protocol: Ignore inode time when xattr&ownership is ignored (fixes …

…syncthing#8654) (syncthing#8655) lib/protocol: Ignore inode time when both xattr and ownership is ignored (fixes syncthing#8654)
imsodin · Nov 8, 2022 · ce2a686 · ce2a686
1 parent a296057
commit ce2a686
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/protocol/bep_extensions.go b/lib/protocol/bep_extensions.go
@@ -244,9 +244,9 @@ func (f FileInfo) isEquivalent(other FileInfo, comp FileInfoComparison) bool {
 		return false
 	}
 
-	// If we are recording inode change times and it changed, they are not
-	// equal.
-	if (f.InodeChangeNs != 0 && other.InodeChangeNs != 0) && f.InodeChangeNs != other.InodeChangeNs {
+	// If we care about either ownership or xattrs, are recording inode change
+	// times and it changed, they are not equal.
+	if !(comp.IgnoreOwnership && comp.IgnoreXattrs) && f.InodeChangeNs != 0 && other.InodeChangeNs != 0 && f.InodeChangeNs != other.InodeChangeNs {
 		return false
 	}