osd: simplify scrub sanity checks

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 923fbad83ce3eedf33c25e0b4a6057b663d927e5..fbe0ab107daa1df70b08195d6fba666e262560c7 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3074,16 +3074,8 @@ void PG::scrub()
  
   epoch_t epoch = info.history.same_acting_since;
 
-  if (!is_primary()) {
-    dout(10) << "scrub -- not primary" << dendl;
-    clear_scrub_reserved();
-    unlock();
-    osd->map_lock.put_read();
-    return;
-  }
-
-  if (!is_active() || !is_clean()) {
-    dout(10) << "scrub -- not active or not clean" << dendl;
+  if (!is_primary() || !is_active() || !is_clean()) {
+    dout(10) << "scrub -- not primary or active or not clean" << dendl;
     clear_scrub_reserved();
     unlock();
     osd->map_lock.put_read();