From: Sage Weil <sage@inktank.com>
Date: Tue, 20 May 2014 21:52:59 +0000 (-0700)
Subject: mds: make sure mds_stamp is set when we journal
X-Git-Tag: v0.82~57^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29c684442e75cefc057fbfe091b239a0e4dfc6d3;p=ceph.git

mds: make sure mds_stamp is set when we journal

This is a catch-all that we are carrying over from before.  It may not
be strictly necessary, but I'm not inclined to check the code for
Mutation users who didn't call acquire_locks().

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4c9a1e530e92..e33b0109cf27 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -1857,9 +1857,9 @@ void MDCache::predirty_journal_parents(MutationRef mut, EMetaBlob *blob,
 
   assert(mds->mdlog->entry_is_open());
 
-  // declare now?
-  if (mut->now == utime_t())
-    mut->now = ceph_clock_now(g_ceph_context);
+  // make sure stamp is set
+  if (mut->get_mds_stamp() == utime_t())
+    mut->set_mds_stamp(ceph_clock_now(g_ceph_context));
 
   if (in->is_base())
     return;