Merge pull request #27830 from dzafman/wip-38124

osd: Don't include user changeable flag in snaptrim related assert

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

diff --cc src/osd/PrimaryLogPG.h
index f445df1f0ec81ebd7624a8d2af5adbdf57b63727,70e390ae179a61e81130f83360eda24ab8507cb2..33a0d32b2236c4cb8a987f64a16cfeb205a2a4c7
--- 1/src/osd/PrimaryLogPG.h
--- 2/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@@ -1611,9 -1605,9 +1615,9 @@@ private
  
      explicit Trimming(my_context ctx)
        : my_base(ctx),
 -      NamedState(context< SnapTrimmer >().pg, "Trimming") {
 +      NamedState(nullptr, "Trimming") {
        context< SnapTrimmer >().log_enter(state_name);
-       ceph_assert(context< SnapTrimmer >().can_trim());
+       ceph_assert(context< SnapTrimmer >().permit_trim());
        ceph_assert(in_flight.empty());
      }
      void exit() {