From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 26 Oct 2017 11:44:11 +0000 (+0800)
Subject: msg/async:remove redudant judgement for msg-header-crc.
X-Git-Tag: v13.0.1~338^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9a975de5edb0061df87a90bf4fdf3500a2a92c3;p=ceph.git

msg/async:remove redudant judgement for msg-header-crc.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 93e043673d4b..cf2f7517b45e 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -447,22 +447,23 @@ void AsyncConnection::process()
           ldout(async_msgr->cct, 20) << __func__ << " got MSG header" << dendl;
 
           header = *((ceph_msg_header*)state_buffer);
-          if (msgr->crcflags & MSG_CRC_HEADER)
-            header_crc = ceph_crc32c(0, (unsigned char *)&header,
-                                     sizeof(header) - sizeof(header.crc));
 
-          ldout(async_msgr->cct, 20) << __func__ << " got envelope type=" << header.type
+	  ldout(async_msgr->cct, 20) << __func__ << " got envelope type=" << header.type
                               << " src " << entity_name_t(header.src)
                               << " front=" << header.front_len
                               << " data=" << header.data_len
                               << " off " << header.data_off << dendl;
 
-          // verify header crc
-          if (msgr->crcflags & MSG_CRC_HEADER && header_crc != header.crc) {
-            ldout(async_msgr->cct,0) << __func__ << " got bad header crc "
-                                     << header_crc << " != " << header.crc << dendl;
-            goto fail;
-          }
+	  if (msgr->crcflags & MSG_CRC_HEADER) {
+	    header_crc = ceph_crc32c(0, (unsigned char *)&header,
+		sizeof(header) - sizeof(header.crc));
+	    // verify header crc
+	    if (header_crc != header.crc) {
+	      ldout(async_msgr->cct,0) << __func__ << " got bad header crc "
+		<< header_crc << " != " << header.crc << dendl;
+	      goto fail;
+	    }
+	  }
 
           // Reset state
           data_buf.clear();