From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 13 Feb 2014 02:28:49 +0000 (+0800)
Subject: mds: properly replay dentry trace for open truncate.
X-Git-Tag: v0.78~185^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1230%2Fhead;p=ceph.git

mds: properly replay dentry trace for open truncate.

Open request created by ceph_atomic_open() wants dentry trace. But
the corresponding code is missing in Server::do_open_truncate().

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 36c11402840c..59c3cfd20ee9 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3323,8 +3323,14 @@ void Server::do_open_truncate(MDRequest *mdr, int cmode)
   
   mdr->o_trunc = true;
 
-  journal_and_reply(mdr, in, 0, le, new C_MDS_inode_update_finish(mds, mdr, in, old_size > 0,
-								  changed_ranges));
+  CDentry *dn = 0;
+  if (mdr->client_request->get_dentry_wanted()) {
+    assert(mdr->dn[0].size());
+    dn = mdr->dn[0].back();
+  }
+
+  journal_and_reply(mdr, in, dn, le, new C_MDS_inode_update_finish(mds, mdr, in, old_size > 0,
+								   changed_ranges));
 }