Merge pull request #46498 from ronen-fr/wip-rf-46440-quincy

quincy: osd/scrub: do not start scrubbing if the PG is snap-trimming

Reviewed-by: Neha Ojha <nojha@redhat.com>

diff --cc src/osd/PG.cc
index d77cef0d7b5c552b1156a2124b56dcea82c65a7d,768a710a2c0afd2e39d4213e221bc973ca07542a..9b0eb491c9875351031daceab329ab28161ce27c
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -1370,8 -1380,9 +1379,8 @@@ Scrub::schedule_result_t PG::sched_scru
    m_scrubber->set_op_parameters(m_planned_scrub);
  
    dout(10) << __func__ << ": queueing" << dendl;
 -  m_scrubber->set_queued_or_active();
    osd->queue_for_scrub(this, Scrub::scrub_prio_t::low_priority);
-   return Scrub::schedule_result_t::scrub_initiated;
+   return schedule_result_t::scrub_initiated;
  }
  
  double PG::next_deepscrub_interval() const