From: Samuel Just <samuelj@hq.newdream.net>
Date: Tue, 4 Jan 2011 22:30:15 +0000 (-0800)
Subject: PG: Fixes bug in _scrub with checking clones
X-Git-Tag: v0.24.1~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fab61391b7c662964e2498d31c1e1d0b65d4894e;p=ceph.git

PG: Fixes bug in _scrub with checking clones

I introduced this bug in
4a4a1e53c7d380cd0b582c1d0685fd0ef4ef1711.
curclone++ not curclone--.

Signed-off-by: Samuel Just <samuelj@hq.newdream.net>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2361543ee99f..fc5180c23508 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4079,10 +4079,11 @@ int ReplicatedPG::_scrub(ScrubMap& scrubmap, int& errors, int& fixed)
       // ...
 
       // what's next?
+      if (curclone != snapset.clones.rend())
+	curclone++;
+
       if (curclone == snapset.clones.rend())
 	head = sobject_t();
-      else
-	curclone--;
 
     } else {
       // it's unversioned.