]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix scrub crash 20249/head
authordongdong tao <tdd21151186@gmail.com>
Thu, 18 Jan 2018 16:08:44 +0000 (00:08 +0800)
committerPrashant D <pdhange@redhat.com>
Fri, 2 Feb 2018 00:55:18 +0000 (19:55 -0500)
Fixes: http://tracker.ceph.com/issues/22730
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit e741c1a6e16cb5179d623ef491f66d31b0ffdfd6)

src/mds/CInode.h

index 99f12de927f3f04e1449d1033f78fd835b004c21..87e1b8a676413673ace2f9a684fc3c1f644c7ed8 100644 (file)
@@ -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();
     }
   };