]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: simplify ShardServices::snap_request_reservation()
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 26 Oct 2022 18:55:22 +0000 (18:55 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 28 Feb 2023 16:22:04 +0000 (16:22 +0000)
`on_preempt` is not used by snap trimming; we can left its default.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/shard_services.h

index 86397971f14aba0a1415c636fa854dd9a8ba14be..f366b96c9c24ff77a817d5ebe9fd54e87b347e4a 100644 (file)
@@ -533,19 +533,16 @@ public:
   seastar::future<> snap_request_reservation(
     spg_t item,
     Context *on_reserved,
-    unsigned prio,
-    Context *on_preempt) {
+    unsigned prio) {
     return with_singleton(
       [item, prio](OSDSingletonState &singleton,
-                  Context *wrapped_on_reserved, Context *wrapped_on_preempt) {
+                  Context *wrapped_on_reserved) {
        return singleton.snap_reserver.request_reservation(
          item,
          wrapped_on_reserved,
-         prio,
-         wrapped_on_preempt);
+         prio);
       },
-      invoke_context_on_core(seastar::this_shard_id(), on_reserved),
-      invoke_context_on_core(seastar::this_shard_id(), on_preempt));
+      invoke_context_on_core(seastar::this_shard_id(), on_reserved));
   }
 
 #undef FORWARD_CONST