Revert "Merge pull request #3641 from athanatos/wip-10731"

This reverts commit 54a22236a00ab18ec62c6e7df1117055d5fd0ef1, reversing
changes made to 7eca03e290f278bdf3a9613e0f383ec49f40b645.

Conflicts:
	src/include/ceph_features.h

1 files changed, 1 insertions, 6 deletions

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f0bc46729c3..c941544d7c2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1450,13 +1450,8 @@ void ReplicatedPG::do_op(OpRequestRef& op)
    * We can enable degraded writes on ec pools by blocking such a write
    * to a peer until all previous writes have completed.  For now, we
    * will simply block them.
-   *
-   * We also block if our peers do not support DEGRADED_WRITES.
    */
-  if ((pool.info.ec_pool() ||
-       !(get_min_peer_features() & CEPH_FEATURE_OSD_DEGRADED_WRITES)) &&
-      write_ordered &&
-      is_degraded_object(head)) {
+  if (pool.info.ec_pool() && write_ordered && is_degraded_object(head)) {
     wait_for_degraded_object(head, op);
     return;
   }