From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 29 Jan 2025 16:23:58 +0000 (-0500)
Subject: tools/cephfs/DataScan: test equality of link including frag
X-Git-Tag: v20.0.0~226^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9c83f6c9a50bef7535d17a32618cfd0ec39b976a;p=ceph.git

tools/cephfs/DataScan: test equality of link including frag

To address the possibility of two primary links existing in different
fragments.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
---

diff --git a/src/tools/cephfs/DataScan.cc b/src/tools/cephfs/DataScan.cc
index 0da8ff9dede91..281af410c2a96 100644
--- a/src/tools/cephfs/DataScan.cc
+++ b/src/tools/cephfs/DataScan.cc
@@ -1291,7 +1291,7 @@ int DataScan::scan_links()
 
     for (auto& q : p.second) {
       // in the middle of dir fragmentation?
-      if (newest.dirino == q.dirino && newest.name == q.name) {
+      if (newest == q) {
 	snaps.insert(make_move_iterator(begin(q.snaps)),
 		     make_move_iterator(end(q.snaps)));
 	continue;