From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 20 Dec 2023 06:54:56 +0000 (-0500)
Subject: tools/cephfs/DataScan: do not error out when failing to read a dentry
X-Git-Tag: v20.0.0~226^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff44ab5e63b42a53f32f3056a8b63efd511014bb;p=ceph.git

tools/cephfs/DataScan: do not error out when failing to read a dentry

Give a chance for the scan tool to proceed with other inodes/dentries.

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 1a40cdefca2f..1a0c75f5dac7 100644
--- a/src/tools/cephfs/DataScan.cc
+++ b/src/tools/cephfs/DataScan.cc
@@ -1358,7 +1358,7 @@ int DataScan::scan_links()
       derr << "Unexpected error reading dentry "
 	   << p.second.dirfrag() << "/" << p.second.name
 	   << ": " << cpp_strerror(r) << dendl;
-      return r;
+      continue;
     }
 
     if (inode.inode->ino != p.first || inode.inode->version != p.second.version)
@@ -1384,7 +1384,7 @@ int DataScan::scan_links()
       derr << "Unexpected error reading dentry "
 	<< p.second.dirfrag() << "/" << p.second.name
 	<< ": " << cpp_strerror(r) << dendl;
-      return r;
+      continue;
     }
 
     if (first != CEPH_NOSNAP) {