diff --git a/src/osd/osd_primary.h b/src/osd/osd_primary.h index 161421a1..6edf1533 100644 --- a/src/osd/osd_primary.h +++ b/src/osd/osd_primary.h @@ -9,7 +9,6 @@ #define SUBMIT_READ 0 #define SUBMIT_RMW_READ 1 #define SUBMIT_WRITE 2 -#define SUBMIT_SCRUB_READ 3 struct unstable_osd_num_t { diff --git a/src/osd/osd_primary_subops.cpp b/src/osd/osd_primary_subops.cpp index 04801077..ba4137aa 100644 --- a/src/osd/osd_primary_subops.cpp +++ b/src/osd/osd_primary_subops.cpp @@ -153,13 +153,13 @@ int osd_t::submit_primary_subop_batch(int submit_type, inode_t inode, uint64_t o for (int role = 0; role < (op_data->pg ? op_data->pg->pg_size : 1); role++) { // We always submit zero-length writes to all replicas, even if the stripe is not modified - if (!(wr || !rep && stripes[role].read_end != 0 || zero_read == role || submit_type == SUBMIT_SCRUB_READ)) + if (!(wr || !rep && stripes[role].read_end != 0 || zero_read == role)) { continue; } osd_num_t role_osd_num = osd_set[role]; int stripe_num = rep ? 0 : role; - osd_rmw_stripe_t *si = stripes + (submit_type == SUBMIT_SCRUB_READ ? role : stripe_num); + osd_rmw_stripe_t *si = stripes + stripe_num; if (role_osd_num != 0) { si->osd_num = role_osd_num;