From: David Zafman <dzafman@redhat.com>
Date: Tue, 24 Jul 2018 20:30:09 +0000 (-0700)
Subject: osd: Even when we are distrust data_digest, go ahead and set it when we can
X-Git-Tag: v13.2.2~117^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b10549eaaa534b92b83ee7181c509e00f26a209f;p=ceph.git

osd: Even when we are distrust data_digest, go ahead and set it when we can

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3b72d1a116ff7e45f35465db1397f648fb148876)

Conflicts:
	src/osd/PrimaryLogPG.cc (trivial)
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 02ab4b7daba..4aa89555e4b 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -5623,8 +5623,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
   object_info_t& oi = obs.oi;
   const hobject_t& soid = oi.soid;
   const bool skip_data_digest =
-    (osd->store->has_builtin_csum() && osd->osd_skip_data_digest) ||
-    g_conf->osd_distrust_data_digest;
+    osd->store->has_builtin_csum() && osd->osd_skip_data_digest;
 
   PGTransaction* t = ctx->op_t.get();