From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 13 Jun 2016 08:38:07 +0000 (+0800)
Subject: mds: remove useless code
X-Git-Tag: v11.0.0~177^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b686785704e97c1bbb53bb9e2e04d34d7125e0aa;p=ceph.git

mds: remove useless code

As scrub_dentry_next() never returns a negative result code,
it always returns 0, EAGAIN, ENOENT.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 06fada821fcf..77525f3d3b3b 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -345,18 +345,7 @@ void ScrubStack::scrub_dirfrag(CDir *dir,
       return;
     }
 
-    if (r < 0) {
-      // FIXME: how can I handle an error here?  I can't hold someone up
-      // forever, but I can't say "sure you're scrubbed"
-      //  -- should change scrub_dentry_next definition to never
-      //  give out IO errors (handle them some other way)
-      //     
-      derr << __func__ << " error from scrub_dentry_next: "
-           << r << dendl;
-      return;
-    }
-
-    // scrub_dentry_next defined to only give -ve, EAGAIN, ENOENT, 0 -- we should
+    // scrub_dentry_next defined to only give EAGAIN, ENOENT, 0 -- we should
     // never get random IO errors here.
     assert(r == 0);