From: dongdong tao <tdd21151186@gmail.com>
Date: Thu, 18 Jan 2018 16:08:44 +0000 (+0800)
Subject: mds: fix scrub crash
X-Git-Tag: v12.2.3~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20249%2Fhead;p=ceph.git

mds: fix scrub crash

Fixes: http://tracker.ceph.com/issues/22730
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit e741c1a6e16cb5179d623ef491f66d31b0ffdfd6)
---

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 99f12de927f..87e1b8a6764 100644
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -243,8 +243,8 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
     utime_t last_scrub_stamp;
     scrub_stamp_info_t() : scrub_start_version(0), last_scrub_version(0) {}
     void reset() {
-      scrub_start_version = 0;
-      scrub_start_stamp = utime_t();
+      scrub_start_version = last_scrub_version = 0;
+      scrub_start_stamp = last_scrub_stamp = utime_t();
     }
   };